Updated to new controller changes.