015.09 More work on aligning config