changed setpoints to not overlap