Rewrote exporter
Fixed merge error