Introduce max earlier