NFA reform