rearranged config to be cleaner PART 2