Another modification to use the system config. Hopefully things should r...

...un smoothly now.