Save now works for tenant