Tweaks and adding new drafts