removed 'private-' || 'presence-' check