Edited with WG feedback

Hi Peter, please review -01 of the two drafts.