Attempt to bring in jeremyfelt's changes to my own

Crossing my fingers...