revert pocket protection and FIX S2W/S2S/D2W/L2M