changed to customized settings.
fixed merge