dramatically shortening period
scripted update of code from master at f45ff3c dramatically shortening period