denormalized reference links

WE MUST REFACTOR AND CLEANUP CODE