Lawrence's Required Changes

Completed changes required by client as I've not heard from Lawrence.