max' final changes