Deliverable 2 updated