Updated to new draft.