Added more-specific grepping and firstgen allowances