almost back to where tagging was after refactoring but smoother