Updated to newest version of Settings class