Modify S2W/D2W to work as well