Changes after first round of reviews