Changes based on peer review notes