refactor adapters complete