switching to tagging instead of branching