moved 'volatile' qualifiers to a better place