Class update (18/18)

Class update