max's manual changes