Changed main controller