edited for first round of reviews