Max's changes that were emailed