Refactor/dont re-enter block_conencted on duplicate watch calls