working on some branching issues