More changes to index + new config