margins take 2
scripted update of code from master at 2293198 margins take 2