copied new version of exporter