Bring changes that I made to the orginal fork into my fork of alnutile's fork