main controller updated #25