draft and new changes