refactored tag