merging with new xls exporter