Incorporate the feedback from David