Reorganized demo