rearranged config for server and client