Post-Restart Game Refactored/Refined