stragglers
scripted update of code from master at aa76ffa stragglers