Fix link, full rework