Updated linking properly finally