Patch 3

Here are the two files in one request.