tag refactored