change defs to vals, restore link