Class update (13/18)

Class update