CAP-1019: Vivian's Links