working on the adapter