Reworked settings