updated imports
updated imports, new adapter