Incorporated the proposed changes from Tim Graham