Final Changes for Deliverable