further adapter improvements