More changes - not done yet.