Address further review feedback from David Lee.