Adding links and making them clearer