Replaced secondary references with primary ones