Rev'd to use the new configuration code