Restructured demo.