Correct links, take 2