Cathy's changes to view and controller