Added some missing stuff to new draft.