A machine (100) includes an engine (102) connected to an implement pump (204) operating an actuator and to a propel pump operating a motor (106). An electronic controller (218) is disposed to receive at least one parameter selected from the group of: a pressure of fluid at the at least one motor (106), a pressure of fluid at the at least one implement actuator, a rate of rotation of the engine (102), a rate of rotation of the at least one motor (106), and a torque output of the engine (102). The electronic controller (218) monitors the at least one parameter for a predetermined period, and determines an operating mode of the machine (100). The electronic controller (218) then adjusts an underspeed setting for the engine (102) based on the operating mode.