a new draft of both