Reverted some changes to the controller
Merge branch 'corbin-working2'