More changes - now correct