Changed to more general links