Max's changes