added extract-and-watch to functions