More work on partial matching system