Actually not sure what I did, but whatever
Fixed merge conflict with Morgan's new intro