NEB-2513: Noor's Links