improved export feature