Draft revisions

New draft DHCP -04 with S46