In Class Pull Request

please merge my changes