Altered everything according to Melissa's edits