Final config changes???