changes after Brandon's comments