Continued working on adapter