Hugh's local changes