update link evaluation code for other refactoring earlier