This is the first pass of incorporating review commments from the