Added the link network
fixed merge issues