merging in new changes

prepping file for merge