More work on drafts.