More changes, still working