modified switch, switchlink and addedcomments to link