Some changes to the logic, so the game is closer to the original