altered tagging functionality