More tweaks to the way the setting safe looped