NEB-2421: Thorn's Links