Redesign the solution player
Slightly better plans