okay this should run now
scripted update of code from master at 3fe8630 okay this should run now