Added some modifications to make the demo cooler