Updates code with new controller

Author: dbtrue, ammesonb