Class update (12/18)

Class update