configuration overhaul -- unstable!