More work on the new draft