Refactorin to consider changes to game in events