More changes to config, not working yet