More changes. Half-baked.