Final submission for Deliverable 2