Improve End Game Behavior