Class update (3/18)

Class update