Class update (5/18)

Class update