Try to organize match to include tp