Incorporate feedback from Denis