Update final draft. This fixes #3