merge susie's changes
merge changes with susie