Settings improved