minor revisions from prev addr revision, testing stage