committed from d2

this needs rebase or merge