some changes in connection with adaptors changes