Adaption of new changes