working on the export issue