added tagging ability