More changes trying to get this to work