More changes to String