amanda's comments to rachael
Merged new changes