some adapter changes