added  option for conditional links