Edits to make examples work