Using AddAndAxpand instead of AddAt (Andrei)