updated link variables to generic