draft update per discussion on #33