More work on matchmaking