diff --git a/source/precalculus/exercises/outcomes/FN/FN2/generator.sage b/source/precalculus/exercises/outcomes/FN/FN2/generator.sage
index 4640160b..48972808 100644
--- a/source/precalculus/exercises/outcomes/FN/FN2/generator.sage
+++ b/source/precalculus/exercises/outcomes/FN/FN2/generator.sage
@@ -99,7 +99,10 @@ class Generator(BaseGenerator):
             if xpoints[j]<=s and s<=xpoints[j+1]:
                 xvalues.add(round(s,1))
 
-
+    tasks2=[ {"findy": {"xvalue": c, "gx": gc} },
+             {"findx": {"result": b, "values": ",".join([ f"x={i:g}" for i in xvalues])}}
+            ]
+    shuffle(tasks2)
 
     return {
       "fname": fname,
@@ -108,11 +111,13 @@ class Generator(BaseGenerator):
       "gname": gname,
       "g_pieces":[((xpoints[i],xpoints[i+1]),lines[i]) for i in [0..len(lines)-1] ],
       "interval":f"[{xpoints[0]},{xpoints[-1]}]",
-      "xvalue":c, 
-      "gx":gc,
-      "result":b,
+      "tasks2":tasks2,
+      #"xvalue":c, 
+      #"gx":gc,
+      #"result":b,
       #Use the g (general format) to make sure 4 prints as 4, not 4.0
-      "values": [{"x": f"{i:g}"} for i in xvalues]
+      #"values": [{"x": f"{i:g}"} for i in xvalues]
+      #"values": ",".join([ f"x={i:g}" for i in xvalues])
     } 
 
 
diff --git a/source/precalculus/exercises/outcomes/FN/FN2/template.xml b/source/precalculus/exercises/outcomes/FN/FN2/template.xml
index 3e4edce4..3a33d878 100644
--- a/source/precalculus/exercises/outcomes/FN/FN2/template.xml
+++ b/source/precalculus/exercises/outcomes/FN/FN2/template.xml
@@ -29,6 +29,8 @@
                     description="Plot"/>
             </p>
         </intro>
+        <!-- {{#tasks2}} -->
+        <!-- {{#findy}} -->
         <knowl>
             <content>
                 <p>Find <m>{{gname}}({{xvalue}})</m>.
@@ -38,17 +40,20 @@
                 <p><m>{{gname}}({{xvalue}})={{gx}}</m></p>
             </outtro>
         </knowl>
+        <!-- {{/findy}}-->
+        <!-- {{#findx}}-->
         <knowl>
             <content>
-                <p>For which <m>x</m>-values in the interval <m>{{interval}}</m> does <m>{{gname}}(x)={{result}}</m>?
+                <p>For which <m>x</m>-value(s) in the interval <m>{{interval}}</m> does <m>{{gname}}(x)={{result}}</m>?
                 </p>
             </content>
             <outtro>
-                <!--{{#values}}-->
-                <p><m>{{gname}}({{x}})={{result}}</m></p>
-                <!--{{/values}}-->
+                <p><m>{{gname}}(x)={{result}}</m> when <m>{{values}}</m>
+                </p>
             </outtro>
         </knowl>
+        <!-- {{/findx}}-->
+        <!-- {{/tasks2}}-->
     </knowl>