more work on adapters