Updated Main_Controller