Updated draft template