added -watch option