updated work for DWS2