Rewrote references and back-references updates