By the way, custom matcher are simpler now