Using the future ring, compute claim and merge.
Fix typing errors, and use the new plan.