added taging functionality