Added conditional links