More changes

last minute