More changes

Near final version