tag refactoring update