Changes made in second half of class.