Class update (10/18)

Class update