Modified the adapter