tags refactored