export improvements