Further streamlining of link replacement