A little restructurated code, and added function to get Matching supports