wow this is elaborate
scripted update of code from master at 8f8056d wow this is elaborate