More changes for clarity