some more desperation
scripted update of code from master at 652bd73 some more desperation