madness!!!!
scripted update of code from master at dd2bfea madness!!!!