update(en/Jonathan_Nez/a):Check and consolidate refs