added tag functionality