todo: peer reviews and instructor's suggested changes