Updated code a bit and put in the deliverables.