Moved the config around a bit