added S2W/S2S and DT2W