working on adapt