max's changes