Updated settings with shared-csantos