madness!!!
scripted update of code from master at a128b01 madness!!!