refactored tag less