Updated s2w/dt2w/pd

Signed-off-by: torrented <wallace.ryan10@gmail.com>