updated to new controller and ui changes