edited to have all my links