Pull Request A2.5

Here is a pull request for my imporvament