First commit for adaptation