more work on export tool