changed adapter design