more work on Deliverable 2