Improving Grunt Watch