Partial commit of second draft.