New draft and index simplified