Updated Settings code.