Moved  match display code