Class update (1/18)

Class update