Another - hopefully better - attempt to properly mirror all branches