moved configuration modification out of configuration setup phase