Dual sheath redux patch consistency but no esp