Simple rework

Here are the changes that I sent you in the email.

Thank you,
Brian Hamilton