Removed recursive watch statements