rearranged config