Final adaptaion