updated address builder