Finished first draft of new scheme