Added tagging control
Restructuring game win logic