more demo edits