margins take 3
scripted update of code from master at ef65099 margins take 3