Refactoring auto-generate default Run the Demo
Re-ordering according to how I use them