integrated a broken version of tagging