Speed things up a little more!
This commit was based on dirtyunicorns@25182c09a4a63a6d2e015f7662bb9e98a97bcd46
Thanks so much @Mazda--