Tweaked for config