added retargeting & fixed dag