little changes on main controller