changes made after review by Brian
forgot to add new/changed files