Working toward implementing the new adapter