Introduce Garrett Smith's changes

This pull request serves to manage the changes of gar1t which could be good to have in the base.