improve exporting