added address lookup