impoved demo_commands