add s2w
fine tune values for correct triggering
restore delays to pre-s2w
BLN: ADD BLN, all credit to @tbalden