Final edits for demo