Class update (2/18)

Class update