Class update (6/18)

Class update