Class update (17/18)

Class update