Still ugly, but the end of game is clearer.