Class update (9/18)

Class update