now correctly makes use of dl_data structure, further fixing inconsistencies