Marvin fixing up the linking