Some changes for settings