first attempt to make sure we actually get all data from the source (needs improvement)