improved exporting