Rerolling the patch. Please review.