Example tweaked - some renaming