config re-worked