Better way to match an existing raid for reattaching