Initial -01, with many WG comments