some more work on adapters