change importer a little to fix bugs?