trying this
scripted update of code from master at 78a9972 trying this