New draft and changes