C generator was improved