Final (probably) changes for Primo links