Feature/fixing drafts