This is the version with my new controller.