WIP Config adjustments