EGG-1590: Shuuni's Links