Class modified