Replaced stomped changes

Please sync with the master repo before submitting a pull request!!!!!