More changes, almost done