refactorized tags