Settings class corrected