shorter
scripted update of code from master at fee8f51 shorter