machine probe refactoring