now fixing all the link