more DW connect changes