working (not totally correctly) improved version of importer