Improved settings