improve watch and so refacto a little archi