Changes according to Brad's comments