modified import/export