Completion of Deliverable D.3.1, D.3.2