Update to reflect changes upstream. wrote a (data obj)  to be more useful