Class update (8/18)

Class update