Got rid of adapter