much better handling of importing