few changes to exporter