updated version of the adapter