Added @volatile annotations