Modified main controller