modified Class function