improve import a bit