New draft and update to paginate