Refactor watch link and make it lightning fast