NEB-3245: Kalani's Links