Improved Controller & Completed Backtrack