changes to branching in controller