update settings according to nazmul vai's feedback