Lots of edits after the teacher talked to me