Include some more red comments on areas needing change