No Add-link: corrections and slight logic change