Tidied up the Matching Condiiton a little