changed the import structer