diff --git a/apps/demo-game/src/components/DecisionsDisplay.tsx b/apps/demo-game/src/components/DecisionsDisplay.tsx
index b260f099..ec3d73d5 100644
--- a/apps/demo-game/src/components/DecisionsDisplay.tsx
+++ b/apps/demo-game/src/components/DecisionsDisplay.tsx
@@ -107,9 +107,9 @@ function DecisionsDisplayCompact({ segmentDecisions }: DecisionDisplayProps) {
             <TableBody>
               {segmentDecisions.map((e) => {
                 return (
-                  <TableRow key={e.segment.id}>
+                  <TableRow key={e.segment?.id}>
                     <TableCell className="flex text-nowrap">
-                      P{e.period.index + 1} S{e.segment.index + 1}
+                      P{e.period?.index + 1} S{e.segment?.index + 1}
                     </TableCell>
                     <TableCell>
                       <OnOffIcon on={e.decisions.bank} />
diff --git a/apps/demo-game/src/graphql/generated/nexus-typegen.ts b/apps/demo-game/src/graphql/generated/nexus-typegen.ts
index ff830429..c7c56872 100644
--- a/apps/demo-game/src/graphql/generated/nexus-typegen.ts
+++ b/apps/demo-game/src/graphql/generated/nexus-typegen.ts
@@ -387,6 +387,7 @@ export interface NexusGenFieldTypes {
   }
   Query: { // field return type
     game: NexusGenRootTypes['Game'] | null; // Game
+    gameWithoutFacts: NexusGenRootTypes['Game'] | null; // Game
     games: NexusGenRootTypes['Game'][] | null; // [Game!]
     learningElement: NexusGenRootTypes['LearningElementState'] | null; // LearningElementState
     learningElements: NexusGenRootTypes['LearningElement'][] | null; // [LearningElement!]
@@ -565,6 +566,7 @@ export interface NexusGenFieldTypeNames {
   }
   Query: { // field return type name
     game: 'Game'
+    gameWithoutFacts: 'Game'
     games: 'Game'
     learningElement: 'LearningElementState'
     learningElements: 'LearningElement'
@@ -646,6 +648,9 @@ export interface NexusGenArgTypes {
     game: { // args
       id?: number | null; // Int
     }
+    gameWithoutFacts: { // args
+      id?: number | null; // Int
+    }
     learningElement: { // args
       id: string; // ID!
     }
diff --git a/apps/demo-game/src/graphql/generated/ops.ts b/apps/demo-game/src/graphql/generated/ops.ts
index 7e9a2544..4dfff0d6 100644
--- a/apps/demo-game/src/graphql/generated/ops.ts
+++ b/apps/demo-game/src/graphql/generated/ops.ts
@@ -332,6 +332,7 @@ export type PlayerState = {
 export type Query = {
   __typename?: 'Query';
   game?: Maybe<Game>;
+  gameWithoutFacts?: Maybe<Game>;
   games?: Maybe<Array<Game>>;
   learningElement?: Maybe<LearningElementState>;
   learningElements?: Maybe<Array<LearningElement>>;
@@ -349,6 +350,11 @@ export type QueryGameArgs = {
 };
 
 
+export type QueryGameWithoutFactsArgs = {
+  id?: InputMaybe<Scalars['Int']['input']>;
+};
+
+
 export type QueryLearningElementArgs = {
   id: Scalars['ID']['input'];
 };
@@ -515,6 +521,13 @@ export type GameQueryVariables = Exact<{
 
 export type GameQuery = { __typename?: 'Query', game?: { __typename?: 'Game', id: string, status: GameStatus, name: string, activePeriodIx?: number | null, activeSegmentIx?: number | null, activePeriod?: { __typename?: 'Period', id: string, activeSegmentIx?: number | null, segmentCount?: number | null, activeSegment?: { __typename?: 'PeriodSegment', id: string, countdownExpiresAt?: any | null, countdownDurationMs?: number | null } | null, segments: Array<{ __typename?: 'PeriodSegment', id: string }> } | null, periods: Array<{ __typename?: 'Period', id: string, index: number, activeSegmentIx?: number | null, facts: any, segmentCount?: number | null, segments: Array<{ __typename?: 'PeriodSegment', id: string, index: number, countdownExpiresAt?: any | null, countdownDurationMs?: number | null, facts: any, learningElements: Array<{ __typename?: 'LearningElement', id: string, title: string }>, storyElements: Array<{ __typename?: 'StoryElement', id: string, title: string }> }> }>, players: Array<{ __typename?: 'Player', id: string, isReady: boolean, role?: string | null, number: number, name: string, facts: any, experience: number, experienceToNext: number, token: string }> } | null };
 
+export type GameWithoutFactsQueryVariables = Exact<{
+  id?: InputMaybe<Scalars['Int']['input']>;
+}>;
+
+
+export type GameWithoutFactsQuery = { __typename?: 'Query', game?: { __typename?: 'Game', id: string, status: GameStatus, name: string, activePeriodIx?: number | null, activeSegmentIx?: number | null, activePeriod?: { __typename?: 'Period', id: string, activeSegmentIx?: number | null, segmentCount?: number | null, activeSegment?: { __typename?: 'PeriodSegment', id: string, countdownExpiresAt?: any | null, countdownDurationMs?: number | null } | null, segments: Array<{ __typename?: 'PeriodSegment', id: string }> } | null, periods: Array<{ __typename?: 'Period', id: string, index: number, activeSegmentIx?: number | null, segmentCount?: number | null, segments: Array<{ __typename?: 'PeriodSegment', id: string, index: number, countdownExpiresAt?: any | null, countdownDurationMs?: number | null, learningElements: Array<{ __typename?: 'LearningElement', id: string, title: string }>, storyElements: Array<{ __typename?: 'StoryElement', id: string, title: string }> }> }>, players: Array<{ __typename?: 'Player', id: string, isReady: boolean, role?: string | null, number: number, name: string, facts: any, experience: number, experienceToNext: number, token: string }> } | null };
+
 export type GamesQueryVariables = Exact<{ [key: string]: never; }>;
 
 
@@ -912,6 +925,7 @@ export type PlayerStateResolvers<ContextType = any, ParentType extends Resolvers
 
 export type QueryResolvers<ContextType = any, ParentType extends ResolversParentTypes['Query'] = ResolversParentTypes['Query']> = {
   game?: Resolver<Maybe<ResolversTypes['Game']>, ParentType, ContextType, Partial<QueryGameArgs>>;
+  gameWithoutFacts?: Resolver<Maybe<ResolversTypes['Game']>, ParentType, ContextType, Partial<QueryGameWithoutFactsArgs>>;
   games?: Resolver<Maybe<Array<ResolversTypes['Game']>>, ParentType, ContextType>;
   learningElement?: Resolver<Maybe<ResolversTypes['LearningElementState']>, ParentType, ContextType, RequireFields<QueryLearningElementArgs, 'id'>>;
   learningElements?: Resolver<Maybe<Array<ResolversTypes['LearningElement']>>, ParentType, ContextType>;
@@ -987,6 +1001,7 @@ export const SaveConsolidationDecisionDocument = {"kind":"Document","definitions
 export const UpdatePlayerDataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdatePlayerData"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"name"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"facts"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updatePlayerData"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"name"},"value":{"kind":"Variable","name":{"kind":"Name","value":"name"}}},{"kind":"Argument","name":{"kind":"Name","value":"facts"},"value":{"kind":"Variable","name":{"kind":"Name","value":"facts"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"PlayerData"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"PlayerData"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Player"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isReady"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"facts"}},{"kind":"Field","name":{"kind":"Name","value":"experience"}},{"kind":"Field","name":{"kind":"Name","value":"experienceToNext"}},{"kind":"Field","name":{"kind":"Name","value":"achievementKeys"}},{"kind":"Field","name":{"kind":"Name","value":"achievements"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"count"}},{"kind":"Field","name":{"kind":"Name","value":"achievement"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"image"}},{"kind":"Field","name":{"kind":"Name","value":"reward"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"level"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"index"}}]}}]}}]} as unknown as DocumentNode<UpdatePlayerDataMutation, UpdatePlayerDataMutationVariables>;
 export const UpdateReadyStateDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateReadyState"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"isReady"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateReadyState"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"isReady"},"value":{"kind":"Variable","name":{"kind":"Name","value":"isReady"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isReady"}}]}}]}}]} as unknown as DocumentNode<UpdateReadyStateMutation, UpdateReadyStateMutationVariables>;
 export const GameDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"Game"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"game"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"GameData"}},{"kind":"Field","name":{"kind":"Name","value":"activePeriod"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"activeSegmentIx"}},{"kind":"Field","name":{"kind":"Name","value":"activeSegment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"countdownExpiresAt"}},{"kind":"Field","name":{"kind":"Name","value":"countdownDurationMs"}}]}},{"kind":"Field","name":{"kind":"Name","value":"segmentCount"}},{"kind":"Field","name":{"kind":"Name","value":"segments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"periods"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"PeriodData"}}]}},{"kind":"Field","name":{"kind":"Name","value":"players"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isReady"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"number"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"facts"}},{"kind":"Field","name":{"kind":"Name","value":"experience"}},{"kind":"Field","name":{"kind":"Name","value":"experienceToNext"}},{"kind":"Field","name":{"kind":"Name","value":"token"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SegmentData"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PeriodSegment"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"index"}},{"kind":"Field","name":{"kind":"Name","value":"countdownExpiresAt"}},{"kind":"Field","name":{"kind":"Name","value":"countdownDurationMs"}},{"kind":"Field","name":{"kind":"Name","value":"facts"}},{"kind":"Field","name":{"kind":"Name","value":"learningElements"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}},{"kind":"Field","name":{"kind":"Name","value":"storyElements"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"GameData"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Game"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"activePeriodIx"}},{"kind":"Field","name":{"kind":"Name","value":"activeSegmentIx"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"PeriodData"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Period"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"index"}},{"kind":"Field","name":{"kind":"Name","value":"activeSegmentIx"}},{"kind":"Field","name":{"kind":"Name","value":"facts"}},{"kind":"Field","name":{"kind":"Name","value":"segments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"SegmentData"}}]}},{"kind":"Field","name":{"kind":"Name","value":"segmentCount"}}]}}]} as unknown as DocumentNode<GameQuery, GameQueryVariables>;
+export const GameWithoutFactsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GameWithoutFacts"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"game"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"GameData"}},{"kind":"Field","name":{"kind":"Name","value":"activePeriod"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"activeSegmentIx"}},{"kind":"Field","name":{"kind":"Name","value":"activeSegment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"countdownExpiresAt"}},{"kind":"Field","name":{"kind":"Name","value":"countdownDurationMs"}}]}},{"kind":"Field","name":{"kind":"Name","value":"segmentCount"}},{"kind":"Field","name":{"kind":"Name","value":"segments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"periods"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"index"}},{"kind":"Field","name":{"kind":"Name","value":"activeSegmentIx"}},{"kind":"Field","name":{"kind":"Name","value":"segments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"index"}},{"kind":"Field","name":{"kind":"Name","value":"countdownExpiresAt"}},{"kind":"Field","name":{"kind":"Name","value":"countdownDurationMs"}},{"kind":"Field","name":{"kind":"Name","value":"learningElements"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}},{"kind":"Field","name":{"kind":"Name","value":"storyElements"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"segmentCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"players"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isReady"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"number"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"facts"}},{"kind":"Field","name":{"kind":"Name","value":"experience"}},{"kind":"Field","name":{"kind":"Name","value":"experienceToNext"}},{"kind":"Field","name":{"kind":"Name","value":"token"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"GameData"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Game"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"activePeriodIx"}},{"kind":"Field","name":{"kind":"Name","value":"activeSegmentIx"}}]}}]} as unknown as DocumentNode<GameWithoutFactsQuery, GameWithoutFactsQueryVariables>;
 export const GamesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"Games"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"games"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"GameData"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"GameData"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Game"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"activePeriodIx"}},{"kind":"Field","name":{"kind":"Name","value":"activeSegmentIx"}}]}}]} as unknown as DocumentNode<GamesQuery, GamesQueryVariables>;
 export const LearningElementDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"LearningElement"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"learningElement"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"element"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LearningElementData"}},{"kind":"Field","name":{"kind":"Name","value":"options"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"content"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"solution"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LearningElementData"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LearningElement"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"question"}},{"kind":"Field","name":{"kind":"Name","value":"reward"}},{"kind":"Field","name":{"kind":"Name","value":"motivation"}},{"kind":"Field","name":{"kind":"Name","value":"feedback"}}]}}]} as unknown as DocumentNode<LearningElementQuery, LearningElementQueryVariables>;
 export const LearningElementsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"LearningElements"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"learningElements"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LearningElementData"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LearningElementData"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LearningElement"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"question"}},{"kind":"Field","name":{"kind":"Name","value":"reward"}},{"kind":"Field","name":{"kind":"Name","value":"motivation"}},{"kind":"Field","name":{"kind":"Name","value":"feedback"}}]}}]} as unknown as DocumentNode<LearningElementsQuery, LearningElementsQueryVariables>;
diff --git a/apps/demo-game/src/graphql/generated/schema.graphql b/apps/demo-game/src/graphql/generated/schema.graphql
index 07712eb6..3a3ace05 100644
--- a/apps/demo-game/src/graphql/generated/schema.graphql
+++ b/apps/demo-game/src/graphql/generated/schema.graphql
@@ -229,6 +229,7 @@ type PlayerState {
 
 type Query {
   game(id: Int): Game
+  gameWithoutFacts(id: Int): Game
   games: [Game!]
   learningElement(id: ID!): LearningElementState
   learningElements: [LearningElement!]
diff --git a/apps/demo-game/src/graphql/generated/schema.json b/apps/demo-game/src/graphql/generated/schema.json
index 70421fcf..83fb7d03 100644
--- a/apps/demo-game/src/graphql/generated/schema.json
+++ b/apps/demo-game/src/graphql/generated/schema.json
@@ -2838,6 +2838,31 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "gameWithoutFacts",
+            "description": null,
+            "args": [
+              {
+                "name": "id",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "OBJECT",
+              "name": "Game",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "games",
             "description": null,
diff --git a/apps/demo-game/src/pages/admin/games/[id].tsx b/apps/demo-game/src/pages/admin/games/[id].tsx
index 4a4c89fb..709f701d 100644
--- a/apps/demo-game/src/pages/admin/games/[id].tsx
+++ b/apps/demo-game/src/pages/admin/games/[id].tsx
@@ -76,7 +76,7 @@ function ManageGame() {
   const [isSegmentModalOpen, setIsSegmentModalOpen] = useState(false)
 
   const { data, error, loading } = useQuery(GameDocument, {
-    variables: { id: Number(router.query.id) },
+    variables: { id: Number(router.query.id), includeFacts: true },
     pollInterval: 15000,
     skip: !router.query.id,
   })
@@ -788,7 +788,7 @@ function ManageGame() {
       </div>
       <div className="mt-2 flex flex-row gap-2">
         {getButton()}
-        <Link target="_blank" href={`/admin/reports/${game?.id}`}>
+        <Link target="_blank" href={`/reports/${game?.id}`}>
           <Button>Report</Button>
         </Link>
       </div>
diff --git a/apps/demo-game/src/pages/play/cockpit.tsx b/apps/demo-game/src/pages/play/cockpit.tsx
index 2d451a84..af52f71f 100644
--- a/apps/demo-game/src/pages/play/cockpit.tsx
+++ b/apps/demo-game/src/pages/play/cockpit.tsx
@@ -124,6 +124,13 @@ function GameLayout({ children }: { children: React.ReactNode }) {
     role: data.self.role,
   }
 
+  const tabs = [
+    {
+      name: 'Reports',
+      href: `/reports/${data?.result?.currentGame?.id}`,
+    },
+  ]
+
   const sidebar = (
     <div id="sidebar" className="flex flex-col justify-between">
       <Card
@@ -218,11 +225,6 @@ function GameLayout({ children }: { children: React.ReactNode }) {
   )
 }
 
-const tabs = [
-  { name: 'Welcome', href: '/play/welcome' },
-  { name: 'Cockpit', href: '/play/cockpit' },
-]
-
 const colors = [
   'hsl(var(--chart-1))',
   'hsl(var(--chart-2))',
diff --git a/apps/demo-game/src/pages/admin/reports/[id].tsx b/apps/demo-game/src/pages/reports/[id].tsx
similarity index 97%
rename from apps/demo-game/src/pages/admin/reports/[id].tsx
rename to apps/demo-game/src/pages/reports/[id].tsx
index f88edee6..7080268d 100644
--- a/apps/demo-game/src/pages/admin/reports/[id].tsx
+++ b/apps/demo-game/src/pages/reports/[id].tsx
@@ -5,6 +5,7 @@ import { useQuery } from '@apollo/client'
 import {
   Game,
   GameDocument,
+  GameWithoutFactsDocument,
   SpecificResultsDocument,
 } from 'src/graphql/generated/ops'
 
@@ -48,6 +49,7 @@ import {
   YAxis,
 } from 'recharts'
 
+import { useSession } from 'next-auth/react'
 import { composeChartData } from '~/lib/analysis'
 import { NUM_MONTHS } from '~/lib/constants'
 
@@ -71,11 +73,20 @@ function ReportGame() {
 
   const [currPeriod, setCurrPeriod] = useState<number>(0)
 
-  const { data, error, loading } = useQuery(GameDocument, {
-    variables: { id: Number(router.query.id) },
-    // pollInterval: 15000,
-    skip: !router.query.id,
-  })
+  const { data: sessionData, status: sessionStatus } = useSession()
+  const isAuthenticated = sessionStatus === 'authenticated'
+  const isAdmin = sessionData?.user?.role === 'ADMIN'
+
+  const skipQuery = !router.query.id || !isAuthenticated
+
+  const { data, error, loading } = useQuery(
+    isAdmin ? GameDocument : GameWithoutFactsDocument,
+    {
+      variables: { id: Number(router.query.id) },
+      // pollInterval: 15000,
+      skip: skipQuery,
+    }
+  )
 
   const {
     data: segmentEndResults,
@@ -258,8 +269,6 @@ function ReportGame() {
 
     const previousPeriodResults = periodEndResults.specificResults
 
-    console.log('previousPeriodResults', previousPeriodResults)
-
     const riskReturnPerPeriod = previousPeriodResults.reduce((acc, result) => {
       if (!acc[result.period.index]) {
         acc[result.period.index] = {
@@ -308,7 +317,8 @@ function ReportGame() {
     segmentEndResultsLoading ||
     periodEndResultsLoading ||
     !memoizedDataPeriod ||
-    !memoizedData
+    !memoizedData ||
+    skipQuery
   ) {
     return <div>loading...</div>
   }
diff --git a/packages/platform/public/ops/QGameWithoutFacts.graphql b/packages/platform/public/ops/QGameWithoutFacts.graphql
new file mode 100644
index 00000000..3dc5a892
--- /dev/null
+++ b/packages/platform/public/ops/QGameWithoutFacts.graphql
@@ -0,0 +1,63 @@
+#import "./FGameData.graphql"
+#import "./FPlayerData.graphql"
+
+query GameWithoutFacts($id: Int) {
+  gameWithoutFacts(id: $id) {
+    ...GameData
+    activePeriod {
+      id
+      activeSegmentIx
+      activeSegment {
+        id
+        countdownExpiresAt
+        countdownDurationMs
+      }
+      segmentCount
+      segments {
+        id
+      }
+    }
+    periods {
+      id
+
+      index
+      activeSegmentIx
+
+      segments {
+        id
+
+        index
+
+        countdownExpiresAt
+        countdownDurationMs
+
+        learningElements {
+          id
+          title
+        }
+
+        storyElements {
+          id
+          title
+        }
+      }
+      segmentCount
+    }
+    players {
+      id
+
+      isReady
+
+      role
+
+      number
+      name
+
+      facts
+
+      experience
+      experienceToNext
+      token
+    }
+  }
+}
diff --git a/packages/platform/src/types/Query.ts b/packages/platform/src/types/Query.ts
index b426f2b6..256790c0 100644
--- a/packages/platform/src/types/Query.ts
+++ b/packages/platform/src/types/Query.ts
@@ -27,6 +27,16 @@ export function generateBaseQueries() {
         },
       })
 
+      t.field('gameWithoutFacts', {
+        type: Game,
+        args: {
+          id: intArg(),
+        },
+        async resolve(_, args, ctx) {
+          return GameService.getGame(args, ctx)
+        },
+      })
+
       t.field('result', {
         type: PlayerState,
         async resolve(_, args, ctx) {
diff --git a/packages/ui/src/components/NavBar.tsx b/packages/ui/src/components/NavBar.tsx
index 6405c0f3..162d541f 100644
--- a/packages/ui/src/components/NavBar.tsx
+++ b/packages/ui/src/components/NavBar.tsx
@@ -7,6 +7,7 @@ import {
   NavigationMenuList,
   navigationMenuTriggerStyle,
 } from '@uzh-bf/design-system/dist/future'
+import { Button } from '@uzh-bf/design-system'
 
 interface Props {
   tabs: { name: string; href: string }[]
@@ -23,7 +24,7 @@ function NavBar({
   playerLevel,
   playerColor,
   playerImgPathAvatar,
-  playerHref = '/play/cockpit',
+  playerHref = '/play/welcome',
 }: Props) {
   return (
     <>
@@ -48,7 +49,9 @@ function NavBar({
               <div className="text-orange-700">Level {playerLevel}</div>
             </div>
             <div className="w-10">
-              <Logo imgPathAvatar={playerImgPathAvatar} color={playerColor} />
+              <Button className={{ root: 'p-0 hover:' }}>
+                <Logo imgPathAvatar={playerImgPathAvatar} color={playerColor} />
+              </Button>
             </div>
           </div>
         </Link>