Updated draft of WiFi2