Changes from class.