Refactored code and Update Wins to happen on move