changed functionality for drafts2