additional changes 4/28 end of class