Here is the updated Patch.
Please review.
Thanks!