d2w feature added