Nearing a complete new draft