many changes to fix the tagging