Added Tagging on Then