Redid the tagging changes