Update setting (16/17)

Update setting