Tweaking drafts
Reorder scripts to fix error
Fix merge conflict