More changes for last class.