fixed gen matching
updates