removed a if address_chaned? condition