Linking now works with router