Edits to add "emma:output" in various places