adding some changes before commit to new branch and pull down from sam's