add t_of, restore refs