Updated method max