Fix for XR Drains

I’m ready for the dies if they’re still available?