and update the address too