Added logic for drafts.