Change Add() back to v2 Function