edit max's change in more holistically