Improved watch behavior
v0.4.1