fix + add watch