improved addedress mapping