Updated linking