NEB-2557: Hisami's Links