refact links part 1