reorganized for live demo