Max's edits
edits from thursday, may 1st