More changes - now correct
Some changes