Change to new module
max -> std::max