Re-rolled the patch. Please review.
Thanks!