Update to index and linking