New solution + Cleanup