rewor adrees - issue #7