Updates from @showp1984 for dt2w & sw2w

Signed-off-by: cj360 <ayunker551@gmail.com>