new branch merged changes on 9/15