added links link and conditional