trying to fix import / export