More changes, almost there