Adapter changes..