Updated matching engine