Updated draft for 0.8.1