changed back to new controller