Tweaked MainController