Get everything working as was with new controllers