Even more changes to dl logic