diff --git a/template.md b/template.md
index 5d3d0552..7715c53f 100644
--- a/template.md
+++ b/template.md
@@ -1,3 +1,4 @@
+
 <img src="../images/Ecma_RVB-003.jpg" align="right" height="70" alt="" />
 
 ## Agenda for the TBD meeting of Ecma TC39
@@ -38,11 +39,11 @@ Deadline for advancement eligibility: [**January 1, 2000, 18:00 UTC**](https://w
   - <sub>Note: this time is selected to be precisely 10 days prior to the start of the meeting</sub>
 
 1. Proposals not looking to advance may be added at any time; if after the deadline, please always use a pull request so that members are notified of changes.
-1. Proposals looking to advance to stage 1 must be added (and noted as such) prior to the deadline.
+1. Proposals looking to advance to stage 0 or 1 must be added (and noted as such) prior to the deadline.
     1. Such proposals *should* include supporting materials when possible.
 1. Proposals looking to advance to stages 2, 3, or 4 must be added (and noted as such) *along with the necessary materials* prior to the deadline.
     1. Such proposals *must* link to supporting materials prior to the deadline, or they will not be eligible for advancement. If these materials change substantially after the deadline, the proposal may be disqualified from advancement, based on the committee’s judgment.
-1. Timeboxed topics may be 15, 30, 45, or 60 minutes in length.
+1. Proposal-based agenda items should be sorted primarily by stage (descending), secondarily by timebox (ascending), and finally by insertion date.
 
 Supporting materials includes slides, a link to the proposal repository, a link to spec text, etc.; essentially, anything you are planning to present to the committee, or that would be useful for delegates to review.
 
@@ -50,42 +51,55 @@ Supporting materials includes slides, a link to the proposal repository, a link
 
 1. Opening, welcome and roll call
     1. Opening of the meeting (Mr. Jaeschke)
+    1. TC39 follows its [Code of Conduct](https://tc39.github.io/code-of-conduct/)
     1. Introduction of attendees
     1. Host facilities, local logistics
     1. Quick recap of meeting IPR policy (Daniel Ehrenberg)
+    1. Overview of communication tools (Brian Terlson)
 1. Find volunteers for note taking
 1. Adoption of the agenda
 1. Approval of the minutes from last meeting
 1. Next meeting host and logistics
-1. Report from the Ecma Secretariat (15m)
+1. Report from the Ecma Secretariat (15m, Istvan Sebestyen, must be Wednesday)
 1. Project Editors’ Reports
     1. ECMA262 Status Updates (15m)
     1. ECMA402 Status Updates (15m)
     1. ECMA404 Status Updates (15m)
     1. Test262 Status Updates (15m)
+1. Updates from the CoC Committee (15m)
 1. Web compatibility issues / Needs Consensus PRs
-    1. 15-minute items
-    1. 30-minute items
-    1. 45-minute items
-    1. 60-minute items
-    1. Timebox Not Yet Selected (please select one)
-1. Timeboxed overflow from previous meeting
-    1. 15-minute items
-    1. 30-minute items
-    1. 45-minute items
-    1. 60-minute items
-    1. Timebox Not Yet Selected (champion, please select one)
-1. Timeboxed agenda items
-    1. 15-minute items
-    1. 30-minute items
-    1. 45-minute items
-    1. 60-minute items
-1. Non-timeboxed overflow from previous meeting
-1. Non-timeboxed agenda items
-    1. Stage 0+ proposals looking to advance
-    1. New proposals
-    1. Discussion and updates for Stage 0+ Proposals
-1. Overflow from timeboxed discussion items (in insertion order)
+
+    | timebox | topic | presenter |
+    |:-------:|-------|-----------|
+
+1. Overflow from previous meeting
+
+    | timebox | topic | presenter |
+    |:-------:|-------|-----------|
+
+1. Short (&le;30m) Timeboxed Discussions
+
+    | timebox | topic | presenter |
+    |:-------:|-------|-----------|
+
+1. Proposals
+
+    | stage | timebox | topic | presenter |
+    |:-----:|:-------:|-------|-----------|
+
+1. Exceptions for this meeting
+
+
+1. Longer or open-ended discussions
+
+    | timebox | topic | presenter |
+    |:-------:|-------|-----------|
+
+1. Overflow from timeboxed agenda items (in insertion order)
+
+    | topic | presenter |
+    |-------|-----------|
+
 1. Other business
     1. Thank host
 1. Adjournment