Improved max seconds