Updated for new draft.