added automatic tracking insertion