Updated main controller to EEIF style
Merge branch 'fixedmain'