working on reviewer comments