EGG-2081: Emilie's Links