almost there
drop old fns from dsputils