small changes , adapter