okay how about this
scripted update of code from master at c96889d okay how about this