New email logic for min and max. Cosmetic changes