Putting stuff back into the old exporter (see if this works)