moved all config together