more trying
scripted update of code from master at cf489da more trying