More work on the draft