Updated Addresses Option A