Make tutorial probing smarter