Add Mode
Fix
Merge branch 'add-mode'