changing back to working version and then branching