added some tagging functionality