Minor edits to Jan 06 demo