CAP-1226: Lester's Links