Updating to use local settings