improve matching from last night's work