Reorganized settings parameters
Reorganized settings parameters