Settings mechanism is changed a bit