flaw matching added, without data collection ... :(