Fix watch to actually work