More work done of the draft.