Changed the way settings are set