Added additional logic checks and set default increment.