Moved to iterative matching model