Rework drafts