updated tagging system