More changes trying to fix thing