modified class.h