More changes from before.