Class update (16/18)

Class update