changes for final deliverable, just editing comments