improved dwc mapping