added tagging functionality