import completed. editor refactored