changed controllers, partial1, and partial2