Attempt at new auto-adding.