More changes to the new sample config.