Updated design comp link logic