improvement MainController - now I like IT