Changed to dynamic links