refactoring (demo_scene)  ++