Advance in the code for match logic