D2W feauture added