Deliverable Candidate 1 (missing comments)