Updateting MainController and Main