Changed structure and improved grunt watch performance