Edits from the demo.