updated to use DW