updated address handling