finishing merge with JustinBranch