adaptors minor changes