revised for deliverable 6