Updated for Deliverable 2