Re-rolled the patch #5, against D10. Attached patch for same. Please review.