fixed the import logic again and some design issues