Doesn't look like "link" is used in this function anymore - can you remove that argument?