Somehow modernized the class.