Up-to-date code from class.