modifyings by loremipsum31, pull request