new demo, and annotated source