Better address replace