getting closer...
scripted update of code from master at 9b4f278 getting closer...