goddammit
scripted update of code from master at 0dfe329 goddammit