More changes

Making some more changes