Fixing the game mechanics