diff --git a/requirements.txt b/requirements.txt
index 863188880..864ae915c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-pretext == 2.24.0
+pretext[prefigure] == 2.36.0
 CodeChat-Server == 0.2.25
 pelican == 4.11.0
 markdown == 3.7.0
diff --git a/source/precalculus/source/08-TE/01.ptx b/source/precalculus/source/08-TE/01.ptx
index f040cf1d2..71569a8bc 100644
--- a/source/precalculus/source/08-TE/01.ptx
+++ b/source/precalculus/source/08-TE/01.ptx
@@ -20,16 +20,9 @@
       For example, consider a point <m>P</m> on the unit circle, with coordinates <m>(x,y)</m>. If we draw a right triangle (as shown in the figure below), the Pythagorean Theorem says that <m>x^2+y^2=1</m>. 
       <figure xml:id="Deriving-Pythagorean-Identity">
         <image>
-          <sageplot>
-p=circle ((0,0), 1)
-p += line([(0,0),(.707,.707), (.707,0), (0,0)],thickness=3,color="black",ticks=[SR(1),SR(1)])
-p += text("$x$", (0.3,-0.1),color="black", fontsize=14)
-p += text("$y$", (.8, 0.4), color="black",fontsize=14)
-p += text("$P=(x,y)$", (.9, .8), color="black",fontsize=14)
-p += text("$1$", (.3, .4), color="black",fontsize=14)
-p.axes(True)
-p
-          </sageplot>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-te1-unit-circle">
+                <xi:include href="prefigure/TE1-unit-circle.xml"/>
+            </prefigure>
         </image>
       </figure>
       But, remember, that the <m>x</m>-coordinate of the point corresponds to <m>\cos\theta</m> and the <m>y</m>-coordinate corresponds to <m>\sin\theta</m>. Thus, we get: <me>\sin^2\theta + \cos^2\theta = 1</me>. Pythagorean Identities are used in solving many trigonometric problems where one trigonometric ratio is given and we are expected to find the other trigonometric ratios. The next two activities will lead us to find the other two Pythagorean Identities.
@@ -290,42 +283,16 @@ p
         </p>
         <figure>
           <sidebyside widths="50% 50%">
-          <image>
-            <sageplot>
-beta=pi/8
-alpha=3*pi/4
-q=plot([],aspect_ratio=1,ticks=[[],[]])
-q+=circle((0,0),1,color="#ddd")
-q+=line([(0,0),(cos(beta),sin(beta))],color="blue",thickness=2)
-q+=arc((0,0),0.2,sector=(0,beta),color="black")
-q+=text(r"$\beta$", (0.3*cos(beta/2),0.3*sin(beta/2)),color="black",fontsize=14)
-q+=line([(0,0),(cos(alpha),sin(alpha))],color="blue",thickness=2)
-q+=arc((0,0),0.15,sector=(0,alpha),color="black")
-q+=text(r"$\alpha$", (0.2*cos(alpha/2),0.2*sin(alpha/2)),color="black",fontsize=14)
-q+=line([(cos(beta),sin(beta)),(cos(alpha),sin(alpha))],color="blue",thickness=2)
-q+=text(r"$P$",(1.1*cos(alpha),1.1*sin(alpha)),color="black",fontsize=14)
-q+=text(r"$Q$",(1.1*cos(beta),1.1*sin(beta)),color="black",fontsize=14)
-q+=text(r"$O$",(-0.1,-0.1),color="black",fontsize=14)
-q
-            </sageplot>
-          </image>
-          <image>
-            <sageplot>
-beta=pi/8
-alpha=3*pi/4
-p=plot([],aspect_ratio=1,ticks=[[],[]])
-p+=circle((0,0),1,color="#ddd")
-p+=line([(0,0),(cos(0),sin(0))],color="blue",thickness=2)
-p+=line([(0,0),(cos(alpha-beta),sin(alpha-beta))],color="blue",thickness=2)
-p+=arc((0,0),0.1,sector=(0,alpha-beta),color="black")
-p+=text(r"$\alpha-\beta$", (0.15*cos((alpha-beta)/2)+0.1,0.15*sin((alpha-beta)/2)),color="black",fontsize=14)
-p+=line([(cos(alpha-beta),sin(alpha-beta)),(cos(0),sin(0))],color="blue",thickness=2)
-p+=text(r"$A$",(1.1*cos(alpha-beta),1.1*sin(alpha-beta)),color="black",fontsize=14)
-p+=text(r"$B$",(1.1*cos(0),1.1*sin(0)+0.05),color="black",fontsize=14)
-p+=text(r"$O$",(-0.1,-0.1),color="black",fontsize=14)
-p
-            </sageplot>
-          </image>
+                    <image>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-TE1-difference1">
+                <xi:include href="prefigure/TE1-difference-1.xml"/>
+            </prefigure>
+        </image>
+                <image>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-TE1-difference2">
+                <xi:include href="prefigure/TE1-difference-2.xml"/>
+            </prefigure>
+        </image>
         </sidebyside>
         <caption>Triangle <m>POQ</m> and its rotation clockwise by <m>\beta</m>, Triangle <m>AOB</m> </caption>
         </figure>
diff --git a/source/precalculus/source/08-TE/05.ptx b/source/precalculus/source/08-TE/05.ptx
index bbbbc8fae..ff0b4d368 100644
--- a/source/precalculus/source/08-TE/05.ptx
+++ b/source/precalculus/source/08-TE/05.ptx
@@ -24,26 +24,12 @@
       <p>
         Suppose you are given the following triangle, where <m>h</m> is the altitude of triangle <m>ABC</m>. By drawing the altitude, we've now created two right triangles. If we label the point where the altitude intersects <m>C</m> as point <m>D</m>, then we can call the triangles <m>ACD</m> and <m>BCD</m>. 
         <figure xml:id="Law-of-Sines-Triangle">
-          <image>
-          <sageplot>
-p=Graphics()
-p += line([(0,0),(4,0), (0,3), (-2,0),(0,0),(0,3)],thickness=3,color="black")
-p += text("$a$", (2.1,1.6),color="black",fontsize=24)
-p += text("$b$", (-1.1, 1.6), color="black",fontsize=24)
-p += text("$c$", (1, -0.1), color="black", fontsize=24)
-p += text("$h$", (0.15,1.5), color="black",fontsize=24)
-p += line( [(-2,-0.1), (0.8,-0.1)], color="black")
-p += line( [(-2,-0.15), (-2,-0.05)], color="black")
-p += line( [(1.2,-0.1), (4,-0.1)], color="black")
-p += line( [(4,-0.15), (4,-0.05)], color="black")
-p += text("$A$", (-2.2,0), color="black", fontsize=24)
-p += text("$B$", (4.2,0), color="black", fontsize=24)
-p += text("$C$", (0,3.2), color="black", fontsize=24)
-p += text("$D$", (0.1,-0.4), color="black", fontsize=24)
-p.axes(False)
-p
-          </sageplot>
-          </image>
+          <caption>Triangle <m>ABC</m> with sides <m>a</m>, <m>b</m>, and <m>c</m>, with an altitude <m>h</m> drawn from <m>C</m> to <m>D</m>.</caption>
+                          <image>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-law-of-sines">
+                <xi:include href="prefigure/TE5-law-of-sines.xml"/>
+            </prefigure>
+        </image>
         </figure>
       </p>
     </introduction>
@@ -154,20 +140,9 @@ p
         Suppose you are given triangle <m>ABC</m> where <m>A=35</m><degree/>, <m>B=25</m><degree/>, and <m>a=10</m> as shown in the figure below.
         <figure xml:id="AAS-Triangle"> 
           <image>
-          <sageplot>
-p=Graphics()
-p += line([(0,0),(4,0), (0,3), (-2,0),(0,0)],thickness=3,color="black")
-p += text("$a=10$", (2.5,1.8),color="black",fontsize=24)
-p += text("$b$", (-1.1, 1.6), color="black",fontsize=24)
-p += text("$c$", (1, -0.1), color="black", fontsize=24)
-p += text("$A$", (-2.2,0), color="black", fontsize=24)
-p += text("$B$", (4.2,0), color="black", fontsize=24)
-p += text("$C$", (0,3.2), color="black", fontsize=24)
-p += text("$25^\circ$", (3.3,.2), color="black", fontsize=20)
-p += text("$35^\circ$", (-1.5,.2), color="black", fontsize=20)
-p.axes(False)
-p 
-          </sageplot>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-law-of-sines-fluency1">
+              <xi:include href="prefigure/TE5-law-of-sines-fluency1.xml"/>
+            </prefigure>
           </image>
         </figure>
       </p>
@@ -291,21 +266,12 @@ p
         Suppose you are given triangle <m>ABC</m> where <m>A=76</m><degree/>, <m>B=34</m><degree/>, and <m>c=9</m> as shown in the figure below.
         <figure xml:id="ASA-Triangle"> 
           <image>
-          <sageplot>
-p=Graphics()
-p += line([(0,0),(4,0), (0,3), (-2,0),(0,0)],thickness=3,color="black")
-p += text("$a$", (2,1.8),color="black",fontsize=24)
-p += text("$b$", (-1.2, 1.6), color="black",fontsize=24)
-p += text("$c=9$", (1, -0.2), color="black", fontsize=24)
-p += text("$A$", (-2.2,0), color="black", fontsize=24)
-p += text("$B$", (4.2,0), color="black", fontsize=24)
-p += text("$C$", (0,3.2), color="black", fontsize=24)
-p += text("$34^\circ$", (3.3,.2), color="black", fontsize=20)
-p += text("$76^\circ$", (-1.5,.2), color="black", fontsize=20)
-p.axes(False)
-p 
-          </sageplot>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-law-of-sines-fluency12">
+              <xi:include href="prefigure/TE5-law-of-sines-fluency12.xml"/>
+            </prefigure>
           </image>
+
+  
         </figure>
       </p>
     </introduction>
@@ -393,22 +359,11 @@ p
       <p>
         Suppose you are given triangle <m>ABC</m>, where <m>A = 30</m><degree/>, <m>a = 7</m>, and <m>b = 16</m> as shown in the figure below.
         <figure xml:id="SSA-no-solution-Triangle"> 
-          <image>
-          <sageplot>
-p=Graphics()
-p += line([(0,0),(4,0), (0,3), (-2,0),(0,0)],thickness=3,color="black")
-p += text("$a=7$", (2.2,1.8),color="black",fontsize=24)
-p += text("$b=16$", (-1.7, 1.6), color="black",fontsize=24)
-p += text("$c$", (1, -0.2), color="black", fontsize=24)
-p += text("$A$", (-2.2,0), color="black", fontsize=24)
-p += text("$B$", (4.2,0), color="black", fontsize=24)
-p += text("$C$", (0,3.2), color="black", fontsize=24)
-p += text("$34^\circ$", (3.3,.2), color="black", fontsize=20)
-p += text("$30^\circ$", (-1.5,.2), color="black", fontsize=20)
-p.axes(False) 
-p
-          </sageplot>
-          </image>
+        <image>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-law-of-sines-fluency2">
+              <xi:include href="prefigure/TE5-law-of-sines-fluency2.xml"/>
+            </prefigure>
+        </image>
         </figure>
       </p>
     </introduction>
@@ -482,21 +437,12 @@ p
       <answer>
         <p>
           Students should be able to draw a triangle like this: 
-          <image>
-          <sageplot>
-p=Graphics()
-p += line([(0,0),(4,0), (0,3), (-2,0),(0,0)],thickness=3,color="black")
-p += text("$a=10$", (2.3,1.8),color="black",fontsize=24)
-p += text("$b=16$", (-1.7, 1.6), color="black",fontsize=24)
-p += text("$c$", (1, -0.2), color="black", fontsize=24)
-p += text("$A$", (-2.2,0), color="black", fontsize=24)
-p += text("$B$", (4.2,0), color="black", fontsize=24)
-p += text("$C$", (0,3.2), color="black", fontsize=24)
-p += text("$30^\circ$", (-1.6,.2), color="black", fontsize=20)
-p.axes(False)
-p 
-          </sageplot>
-          </image>
+        <image>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-law-of-sines-fluency3">
+              <xi:include href="prefigure/TE5-law-of-sines-fluency3.xml"/>
+            </prefigure>
+        </image>
+   
           The following parts of the triangle are missing: <m>B</m>, <m>C</m>, and <m>c</m>.
         </p>
       </answer>
@@ -609,21 +555,11 @@ p
       <answer>
         <p>
           Students should be able to draw a triangle like this:
-          <image>
-          <sageplot>
-p=Graphics()
-p += line([(0,0),(4,0), (0,3), (-2,0),(0,0)],thickness=3,color="black")
-p += text("$a=20$", (2.3,1.8),color="black",fontsize=24)
-p += text("$b=16$", (-1.7, 1.6), color="black",fontsize=24)
-p += text("$c$", (1, -0.2), color="black", fontsize=24)
-p += text("$A$", (-2.2,0), color="black", fontsize=24)
-p += text("$B$", (4.2,0), color="black", fontsize=24)
-p += text("$C$", (0,3.2), color="black", fontsize=24)
-p += text("$30^\circ$", (-1.6,.2), color="black", fontsize=20)
-p.axes(False)
-p  
-          </sageplot>
-          </image>
+        <image>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-law-of-sines-fluency4">
+              <xi:include href="prefigure/TE5-law-of-sines-fluency4.xml"/>
+            </prefigure>
+        </image>
           The following parts of the triangle are missing: <m>B</m>, <m>C</m>, and <m>c</m>.
         </p>
       </answer>
@@ -692,20 +628,9 @@ p
 
       <figure>
         <image>
-          <sageplot>
-p=Graphics()
-p+=line([(0,0),(2,2)],thickness=2,color="black")
-p+=text("$b$",(0.89,1.1),color="black",fontsize=14)
-p+=line([(0,0),(3.5,0)],linestyle="dotted",color="black")
-p+=arc((0,0),0.2,sector=(0,pi/4),color="black")
-p+=text("$A$",(-0.1,-0.1),color="black",fontsize=14)
-p+=text("$C$",(2,2.1),color="black",fontsize=14)
-p+=arc((2,2),1.75,sector=(pi,2*pi),color="blue",linestyle="dashed")
-p+=line([(2,2),(2+1.75*cos(5*pi/3),2+1.75*sin(5*pi/3))],color="blue",thickness=2)
-p+=text("$a$",(2.7,1.1),fontsize=14)
-p.axes(False)
-p
-          </sageplot>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-law-of-sines-ambiguous1">
+              <xi:include href="prefigure/TE5-law-of-sines-ambiguous1.xml"/>
+            </prefigure>
         </image>
         <caption>If <m>a</m> is too short for a given angle <m>A</m> and side <m>b</m>, no matter
           how that leg is swung around the dashed circle, it will not meet a third side of any
@@ -714,24 +639,9 @@ p
       </figure>
       <figure>
         <image>
-          <sageplot>
-p=Graphics()
-p+=line([(0,0),(2,2)],thickness=2,color="black")
-p+=text("$b$",(0.89,1.1),color="black",fontsize=14)
-p+=line([(0,0),(3.5,0)],linestyle="dotted",color="black")
-p+=arc((0,0),0.2,sector=(0,pi/4),color="black")
-p+=text("$A$",(-0.1,-0.1),color="black",fontsize=14)
-p+=text("$C$",(2,2.1),color="black",fontsize=14)
-a=pi/12
-r=2/cos(a)
-p+=arc((2,2),r,sector=(pi,2*pi),color="blue",linestyle="dashed")
-p+=line([(2,2),(2+r*cos(3*pi/2+a),2+r*sin(3*pi/2+a))],color="blue",thickness=2)
-p+=line([(2,2),(2+r*cos(3*pi/2-a),2+r*sin(3*pi/2-a))],color="blue",thickness=2)
-p+=text("$a$",(2.4,1.1),fontsize=14)
-p+=text("$a$",(1.6,1.1),fontsize=14)
-p.axes(False)
-p
-          </sageplot>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-law-of-sines-ambiguous2">
+              <xi:include href="prefigure/TE5-law-of-sines-ambiguous2.xml"/>
+            </prefigure>
         </image>
         <caption>
           If <m>a</m> is larger, the circle of radius <m>a</m> centered at <m>C</m> intersects the
@@ -740,38 +650,16 @@ p
       </figure>
       <figure>
         <sidebyside widths="50% 50%">
-          <image>
-            <sageplot>
-p=Graphics()
-p+=line([(0,0),(2,2)],thickness=2,color="black")
-p+=text("$b$",(0.89,1.1),color="black",fontsize=14)
-p+=line([(0,0),(3.5,0)],linestyle="dotted",color="black")
-p+=arc((0,0),0.2,sector=(0,pi/4),color="black")
-p+=text("$A$",(-0.1,-0.1),color="black",fontsize=14)
-p+=arc((2,2),2,sector=(pi,2*pi),color="blue",linestyle="dashed")
-p+=line([(2,2),(2,0)],color="blue",thickness=2)
-p+=text("$a$",(2.1,1.1),fontsize=14)
-p.axes(False)
-p
-            </sageplot>
-          </image>
-          <image>
-            <sageplot>
-p=Graphics()
-p+=line([(0,0),(2,2)],thickness=2,color="black")
-p+=text("$b$",(0.89,1.1),color="black",fontsize=14)
-p+=line([(0,0),(6,0)],linestyle="dotted",color="black")
-p+=arc((0,0),0.2,sector=(0,pi/4),color="black")
-p+=text("$A$",(-0.2,-0.1),color="black",fontsize=14)
-a=pi/3
-r=2/cos(a)
-p+=arc((2,2),r,sector=(pi,2*pi),color="blue",linestyle="dashed")
-p+=line([(2,2),(2+r*cos(3*pi/2+a),2+r*sin(3*pi/2+a))],color="blue",thickness=2)
-p+=text("$a$",(4.1,1.1),fontsize=14)
-p.axes(False)
-p
-            </sageplot>
-          </image>
+        <image>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-law-of-sines-ambiguous3">
+              <xi:include href="prefigure/TE5-law-of-sines-ambiguous3.xml"/>
+            </prefigure>
+        </image>
+        <image>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-law-of-sines-ambiguous4">
+              <xi:include href="prefigure/TE5-law-of-sines-ambiguous4.xml"/>
+            </prefigure>
+        </image>
         </sidebyside>
         <caption>
           If the length of <m>a</m> is the same as the height of the triangle, the two possibilities converge
@@ -851,21 +739,11 @@ p
       <answer>
         <p>
           Students should draw the triangle like this:
-          <image>
-          <sageplot>
-p=Graphics()
-p += line([(0,0),(4,0), (0,3), (-2,0),(0,0)],thickness=3,color="black")
-p += text("$a$", (2.3,1.8),color="black",fontsize=24)
-p += text("$b=14$", (-1.7, 1.6), color="black",fontsize=24)
-p += text("$c=7$", (1, -0.2), color="black", fontsize=24)
-p += text("$A$", (-2.2,0), color="black", fontsize=24)
-p += text("$B$", (4.2,0), color="black", fontsize=24)
-p += text("$C$", (0,3.2), color="black", fontsize=24)
-p += text("$70^\circ$", (-1.6,.2), color="black", fontsize=20)
-p.axes(False) 
-p 
-          </sageplot>
-          </image>
+        <image>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-law-of-sines-fluency5">
+              <xi:include href="prefigure/TE5-law-of-sines-fluency5.xml"/>
+            </prefigure>
+        </image>
            The following parts of the triangle are missing: <m>B</m>, <m>C</m>, and <m>a</m>.
         </p>
       </answer>
@@ -897,27 +775,14 @@ p
       <p>
         Suppose you are given the following triangle, where <m>h</m> is the altitude of triangle <m>ABC</m>.
         <figure xml:id="Law-of-Cosines-Triangle">
-          <image>
-          <sageplot>
-p=Graphics()
-p += line([(0,0),(4,0), (0,3), (-2,0),(0,0),(0,3)],thickness=3,color="black")
-p += text("$a$", (2.1,1.6),color="black",fontsize=24)
-p += text("$b$", (-1.1, 1.6), color="black",fontsize=24)
-p += text("$m$", (-1, 0.2), color="black",fontsize=24)
-p += text("$c$", (1, -0.1), color="black", fontsize=24)
-p += text("$h$", (0.15,1.5), color="black",fontsize=24)
-p += text("$D$", (0.15,0.2), color="black",fontsize=24)
-p += line( [(-2,-0.1), (0.8,-0.1)], color="black")
-p += line( [(-2,-0.15), (-2,-0.05)], color="black")
-p += line( [(1.2,-0.1), (4,-0.1)], color="black")
-p += line( [(4,-0.15), (4,-0.05)], color="black")
-p += text("$A$", (-2.2,0), color="black", fontsize=24)
-p += text("$B$", (4.2,0), color="black", fontsize=24)
-p += text("$C$", (0,3.2), color="black", fontsize=24)
-p.axes(False)
-p
-          </sageplot>
-          </image>
+          <caption><p>Triangle <m>ABC</m> with sides <m>a</m>, <m>b</m>, and <m>c</m>, with an 
+            altitude <m>h</m> drawn from <m>C</m> to <m>D</m>. The segment <m>AD</m> is labeled <m>d</m>.
+          </p></caption>
+                          <image>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-law-of-cosines">
+                <xi:include href="prefigure/TE5-law-of-cosines.xml"/>
+            </prefigure>
+        </image>
         </figure>
       </p>
     </introduction>
@@ -1063,21 +928,11 @@ p
       <answer>
         <p>
           Students should draw the triangle like this:
-          <image>
-          <sageplot>
-p=Graphics()
-p += line([(0,0),(4,0), (0,3), (-2,0),(0,0)],thickness=3,color="black")
-p += text("$a$", (2.3,1.8),color="black",fontsize=24)
-p += text("$b=14$", (-1.7, 1.6), color="black",fontsize=24)
-p += text("$c=7$", (1, -0.2), color="black", fontsize=24)
-p += text("$A$", (-2.2,0), color="black", fontsize=24)
-p += text("$B$", (4.2,0), color="black", fontsize=24)
-p += text("$C$", (0,3.2), color="black", fontsize=24)
-p += text("$70^\circ$", (-1.6,.2), color="black", fontsize=20)
-p.axes(False)
-p 
-          </sageplot>
-          </image>
+                          <image>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-law-of-sines-fluency5-2">
+                <xi:include href="prefigure/TE5-law-of-sines-fluency5.xml"/>
+            </prefigure>
+        </image>
            The following parts of the triangle are missing: <m>B</m>, <m>C</m>, and <m>a</m>.
         </p>
       </answer>
@@ -1152,18 +1007,9 @@ p
         <p>
           Students should draw the triangle like this: 
           <image>
-          <sageplot>
-p=Graphics()
-p += line([(0,0),(4,0), (0,3), (-2,0),(0,0)],thickness=3,color="black")
-p += text("$a=30$", (2.3,1.8),color="black",fontsize=24)
-p += text("$b=20$", (-1.7, 1.6), color="black",fontsize=24)
-p += text("$c=17$", (1, -0.2), color="black", fontsize=24)
-p += text("$A$", (-2.2,0), color="black", fontsize=24)
-p += text("$B$", (4.2,0), color="black", fontsize=24)
-p += text("$C$", (0,3.2), color="black", fontsize=24)
-p.axes(False)
-p 
-          </sageplot>
+            <prefigure xmlns="https://prefigure.org" label="prefigure-graph-law-of-cosines-fluency1">
+                <xi:include href="prefigure/TE5-law-of-cosines-fluency1.xml"/>
+            </prefigure>
           </image>
           The following parts of the triangle are missing: <m>A</m>, <m>B</m>, and <m>C</m>.
         </p>
diff --git a/source/precalculus/source/08-TE/06.ptx b/source/precalculus/source/08-TE/06.ptx
index c7347b64a..2ba5c034b 100644
--- a/source/precalculus/source/08-TE/06.ptx
+++ b/source/precalculus/source/08-TE/06.ptx
@@ -129,15 +129,9 @@
         <p> 
           <figure xml:id="angle-of-elevation-and-depression">
             <image>
-              <sageplot>
-p=line([(0,8),(10,8),(0,0),(10,0)],color="black",thickness=3)
-p+=arc((0,0),1,sector=(0, arctan(8/10)),color="black")             
-p+=arc((10,8),1,sector=(pi, pi+arctan(8/10)),color="black")
-p+=text("Angle of elevation",(3,0.5),color="black",fontsize=16)
-p+=text("Angle of depression",(6.5,7.5),color="black",fontsize=16)
-p.axes(False)
-p
-              </sageplot>
+              <prefigure xmlns="https://prefigure.org" label="prefigure-graph-elevation-depression">
+                  <xi:include href="prefigure/TE6-elevation-depression.xml"/>
+              </prefigure>
             </image>
             <caption> The angle of elevation and the angle of depression are congruent.</caption>
           </figure>
diff --git a/source/precalculus/source/08-TE/prefigure/TE1-difference-1.xml b/source/precalculus/source/08-TE/prefigure/TE1-difference-1.xml
new file mode 100644
index 000000000..95c8c7496
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE1-difference-1.xml
@@ -0,0 +1,32 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>alpha=3*pi/4</definition>
+<definition>beta=pi/6</definition>
+<definition>q=(cos(beta),sin(beta))</definition>
+<definition>p=(cos(alpha),sin(alpha))</definition>
+<definition>o=(0,0)</definition>
+  <coordinates bbox="(-1.1,-1.1,1.2,1.1)">
+    <axes vticks="(-1,1,1)" vlabels="(-1,1,1)" />
+    <circle center="(0,0)" radius="1" thickness="1" stroke="gray"/>
+    <point at="q" p="q" scale="0.8"><m>Q</m></point>
+    <point at="p" p="p" scale="0.8" alignment="northwest"><m>P</m></point>
+    <point at="o" p="o" scale="0.8" alignment="southwest"><m>O</m></point>
+    <group at="triangle">
+    <line at="l1" endpoints="(o,q)" stroke="blue"/>
+    <line at="l2" endpoints="(o,p)" stroke="blue"/>
+    <line at="l3" endpoints="(p,q)" stroke="blue"/>
+    </group>
+    <angle-marker at="alpha" points="((1,0),o,p)" thickness="1"><m>\alpha</m></angle-marker>
+    <angle-marker at="beta" points="((1,0),o,q)" thickness="1"><m>\beta</m></angle-marker>
+  </coordinates>
+<annotations>
+    <annotation ref="figure" text="Diagram showing a point on the unit circle">
+      <annotation ref="triangle" text="A triangle with vertices P, Q, and the origin O">
+        <annotation ref="p" text="A point on the unit circle in the second quadrant labeled P"/>
+        <annotation ref="q" text="A point on the unit circle in the first quadrant labeled Q"/>
+        <annotation ref="o" text="A point on the unit circle in the first quadrant labeled O"/>
+      </annotation>
+      <annotation ref="alpha" text="The angle between the positive x-axis and the line from O to P is labeled alpha"/>
+      <annotation ref="beta" text="The angle between the positive x-axis and the line from O to Q is labeled beta"/>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE1-difference-2.xml b/source/precalculus/source/08-TE/prefigure/TE1-difference-2.xml
new file mode 100644
index 000000000..598b6cf41
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE1-difference-2.xml
@@ -0,0 +1,30 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>alpha=3*pi/4-pi/6</definition>
+<definition>beta=0</definition>
+<definition>q=(cos(beta),sin(beta))</definition>
+<definition>p=(cos(alpha),sin(alpha))</definition>
+<definition>o=(0,0)</definition>
+  <coordinates bbox="(-1.1,-1.1,1.2,1.1)">
+    <axes vticks="(-1,1,1)" vlabels="(-1,1,1)" />
+    <circle center="(0,0)" radius="1" thickness="1" stroke="gray"/>
+    <point at="q" p="q" scale="0.8"><m>B</m></point>
+    <point at="p" p="p" scale="0.8" alignment="northwest"><m>A</m></point>
+    <point at="o" p="o" scale="0.8" alignment="southwest"><m>O</m></point>
+    <group at="triangle">
+    <line at="l1" endpoints="(o,q)" stroke="blue"/>
+    <line at="l2" endpoints="(o,p)" stroke="blue"/>
+    <line at="l3" endpoints="(p,q)" stroke="blue"/>
+    </group>
+    <angle-marker at="alpha" points="((1,0),o,p)" thickness="1"><m>\alpha-\beta</m></angle-marker>
+  </coordinates>
+<annotations>
+    <annotation ref="figure" text="Diagram showing a point on the unit circle">
+      <annotation ref="triangle" text="A triangle with vertices A,B, and the origin O">
+        <annotation ref="p" text="A point on the unit circle in the second quadrant labeled AP"/>
+        <annotation ref="q" text="A point on the unit circle in the first quadrant labeled B"/>
+        <annotation ref="o" text="A point on the unit circle in the first quadrant labeled O"/>
+      </annotation>
+      <annotation ref="alpha" text="The angle between the positive x-axis and the line from O to A is labeled alpha minus beta"/>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE1-unit-circle.xml b/source/precalculus/source/08-TE/prefigure/TE1-unit-circle.xml
new file mode 100644
index 000000000..5c46f908c
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE1-unit-circle.xml
@@ -0,0 +1,18 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <coordinates bbox="(-1.1,-1.1,1.2,1.1)">
+    <axes vticks="(-1,1,1)" vlabels="(-1,1,1)" />
+    <circle center="(0,0)" radius="1" thickness="2" stroke="blue"/>
+    <point at="p" p="(1/sqrt(2),1/sqrt(2))" scale="0.8"><m>P=(x,y)</m></point>
+    <line at="l1" endpoints="((0,0),(1/sqrt(2),1/sqrt(2)))" scale="0.8"><m>1</m></line>
+    <line at="l2" endpoints="((0,0),(1/sqrt(2),0))" offset="(0,-15)" scale="0.8"><m>x</m></line>
+    <line at="l3" endpoints="((1/sqrt(2),0),(1/sqrt(2),1/sqrt(2)))" rotate="270" offset="(-5,-12)" scale="0.8"><m>y</m></line>
+  </coordinates>
+<annotations>
+    <annotation ref="figure" text="Diagram showing a point on the unit circle">
+      <annotation ref="p" text="A point on the unit circle"/>
+      <annotation ref="l1" text="A line from the origin to the point P"/>
+      <annotation ref="l2" text="A horizontal line along the x axis"/>
+      <annotation ref="l3" text="A vertical line from the x axis to P"/>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE5-law-of-cosines-fluency1.xml b/source/precalculus/source/08-TE/prefigure/TE5-law-of-cosines-fluency1.xml
new file mode 100644
index 000000000..cb58faf6d
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE5-law-of-cosines-fluency1.xml
@@ -0,0 +1,20 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>A=(-2,0)</definition>
+<definition>B=(4,0)</definition>
+<definition>C=(0,3)</definition>
+  <coordinates bbox="(-3,-1,5,4)">
+    <line at="AC" endpoints="(A,C)" stroke="black" rotate="-68" offset="(0,25)" tactile-offset="(0,20)"><m>b=20</m></line>
+    <line at="BC" endpoints="(C,B)" stroke="black" rotate="50"  offset="(0,20)"><m>a=30</m></line>
+    <line at="AB" endpoints="(A,B)" stroke="black" offset="(0,-20)"><m>c=17</m></line>
+    <point p="A" alignment="southwest"><m>A</m></point>
+    <point p="B" alignment="east"><m>B</m></point>
+    <point p="C" alignment="north"><m>C</m></point>
+  </coordinates>
+<annotations>
+  <annotation ref="figure" text="Triangle ABC">
+    <annotation ref="AC" text="The side from A to C is labeled b equals 20"/>
+    <annotation ref="BC" text="The side from B to C is labeled a equals 30"/>
+    <annotation ref="AB" text="The side from A to B is labeled c equals 17"/>
+  </annotation>
+ </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE5-law-of-cosines.xml b/source/precalculus/source/08-TE/prefigure/TE5-law-of-cosines.xml
new file mode 100644
index 000000000..241a64048
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE5-law-of-cosines.xml
@@ -0,0 +1,30 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>A=(-2,0)</definition>
+<definition>B=(4,0)</definition>
+<definition>C=(0,3)</definition>
+<definition>D=(0,0)</definition>
+  <coordinates bbox="(-3,-1,5,4)">
+    <group at="ABC">
+    <line at="CD" endpoints="(C,D)" stroke="blue" rotate="90" offset="(0,4)"><m>h</m></line>
+    <line at="AC" endpoints="(A,C)" stroke="black" rotate="-60" offset="(0,4)" tactile-offset="(0,20)"><m>b</m></line>
+    <line at="BC" endpoints="(C,B)" stroke="black" rotate="50" offset="(0,2)"><m>a</m></line>
+    <line at="AB" endpoints="(A,B)" stroke="black" offset="(0,-20)"><m>c</m></line>
+    <line at="AD" endpoints="(A,D)" stroke="black" ><m>d</m></line>
+    <point p="A" alignment="southwest"><m>A</m></point>
+    <point p="B" alignment="east"><m>B</m></point>
+    <point p="C" alignment="north"><m>C</m></point>
+    <point at="D" p="D" alignment="south"><m>D</m></point>
+    </group>
+  </coordinates>
+<annotations>
+  <annotation ref="figure" text="Triangle ABC with an altitude from C to D.">
+      <annotation ref="AC" text="The side from A to C is labeled b"/>
+      <annotation ref="BC" text="The side from B to C is labeled a"/>
+      <annotation ref="AB" text="The side from A to B is labeled c"/>
+      <annotation ref="CD" text="The altitude from C to D is labeled h">
+        <annotation ref="D" text="The point labeled D lies along AB and directly below C so that the sides labeled c and h are at a right angle."/>
+          </annotation>
+      <annotation ref="AD" text="The length from A to D is labeled d"/>
+  </annotation>
+ </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-ambiguous1.xml b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-ambiguous1.xml
new file mode 100644
index 000000000..582748c8e
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-ambiguous1.xml
@@ -0,0 +1,24 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>A=(0,0)</definition>
+<definition>B=(3.5,0)</definition>
+<definition>b=(2+1.75*cos(5*pi/3),2+1.75*sin(5*pi/3))</definition>
+<definition>C=(2,2)</definition>
+<definition>t=45</definition>
+  <coordinates bbox="(-1,-1,4,4)">
+    <line at="AC" endpoints="(A,C)" stroke="black" rotate="-55" offset="(0,5)" tactile-offset="(0,20)"><m>b</m></line>
+    <line at="BC" endpoints="(C,b)" stroke="blue" rotate="70"  offset="(0,5)"><m>a</m></line>
+    <line at="AB" endpoints="(A,B)" stroke="black" dash="9 9" />
+    <point p="A" alignment="southwest"><m>A</m></point>
+    <point p="C" alignment="north"><m>C</m></point>
+    <angle-marker at="beta" points="(B,A,C)" thickness="1"/>
+    <arc at="circle" center="C" radius="1.75" range="(190,350)" stroke="blue" dash="9 9" thickness="1" />
+  </coordinates>
+<annotations>
+  <annotation ref="figure" text="An incomplete triangle diagram">
+    <annotation ref="AC" text="A line segment from A to C is labeled b"/>
+    <annotation ref="AB" text="The side extending horizontally from A is dashed."/>
+    <annotation ref="BC" text="A blue line segment extending from C is labeled a"/>
+    <annotation ref="circle" text="A part of a dashed blue circle centered at C with radius of length a. It does not meet the dashed line labeled c."/>
+  </annotation>
+ </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-ambiguous2.xml b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-ambiguous2.xml
new file mode 100644
index 000000000..8eea47578
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-ambiguous2.xml
@@ -0,0 +1,29 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>A=(0,0)</definition>
+<definition>B=(3.5,0)</definition>
+<definition>C=(2,2)</definition>
+<definition>a=pi/12</definition>
+<definition>r=2/cos(a)</definition>
+<definition>b=(2+r*cos(3*pi/2+a),2+r*sin(3*pi/2+a))</definition>
+<definition>b2=(2+r*cos(3*pi/2-a),2+r*sin(3*pi/2-a))</definition>
+
+  <coordinates bbox="(-1,-1,4,4)">
+    <line at="AC" endpoints="(A,C)" stroke="black" rotate="-55" offset="(0,5)" tactile-offset="(0,20)"><m>b</m></line>
+    <line at="BC" endpoints="(C,b)" stroke="blue" rotate="75"  offset="(0,5)"><m>a</m></line>
+    <line at="BC2" endpoints="(C,b2)" stroke="blue" rotate="105"  offset="(0,5)"><m>a</m></line>
+    <line at="AB" endpoints="(A,B)" stroke="black" dash="9 9" />
+    <point p="A" alignment="southwest"><m>A</m></point>
+    <point p="C" alignment="north"><m>C</m></point>
+    <angle-marker at="beta" points="(B,A,C)" thickness="1"/>
+    <arc at="circle" center="C" radius="r" range="(190,350)" stroke="blue" dash="9 9" thickness="1" />
+  </coordinates>
+<annotations>
+  <annotation ref="figure" text="An incomplete triangle diagram">
+    <annotation ref="AC" text="A line segment from A to C is labeled b "/>
+    <annotation ref="AB" text="The side extending horizontally from A is dashed."/>
+    <annotation ref="BC" text="A blue line segment extending from C is labeled a"/>
+    <annotation ref="BC2" text="A second blue line segment extending from C is also labeled a"/>
+    <annotation ref="circle" text="A part of a dashed blue circle centered at C with radius of length a. It meets the dashed line in two places."/>
+  </annotation>
+ </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-ambiguous3.xml b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-ambiguous3.xml
new file mode 100644
index 000000000..fcd9d741d
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-ambiguous3.xml
@@ -0,0 +1,24 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>A=(0,0)</definition>
+<definition>B=(3.5,0)</definition>
+<definition>C=(2,2)</definition>
+<definition>b=(2,0)</definition>
+
+  <coordinates bbox="(-1,-1,4,4)">
+    <line at="AC" endpoints="(A,C)" stroke="black" rotate="-45" offset="(0,5)" tactile-offset="(0,20)"><m>b</m></line>
+    <line at="BC" endpoints="(C,b)" stroke="blue" rotate="90"  offset="(0,5)"><m>a</m></line>
+    <line at="AB" endpoints="(A,B)" stroke="black" dash="9 9" />
+    <point p="A" alignment="southwest"><m>A</m></point>
+    <point p="C" alignment="north"><m>C</m></point>
+    <angle-marker at="beta" points="(B,A,C)" thickness="1"/>
+    <arc at="circle" center="C" radius="2" range="(190,350)" stroke="blue" dash="9 9" thickness="1" />
+  </coordinates>
+<annotations>
+  <annotation ref="figure" text="An incomplete triangle diagram">
+    <annotation ref="AC" text="A line segment from A to C is labeled b "/>
+    <annotation ref="AB" text="The side extending horizontally from A is dashed."/>
+    <annotation ref="BC" text="A blue line segment extending straight down from C is labeled a"/>
+    <annotation ref="circle" text="A part of a dashed blue circle centered at C with radius of length a. It meets the dashed line in exactly one place."/>
+  </annotation>
+ </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-ambiguous4.xml b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-ambiguous4.xml
new file mode 100644
index 000000000..3e0f2c29e
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-ambiguous4.xml
@@ -0,0 +1,25 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>A=(0,0)</definition>
+<definition>B=(6,0)</definition>
+<definition>C=(2,2)</definition>
+<definition>a=pi/3</definition>
+<definition>r=2/cos(a)</definition>
+<definition>b=(2+r*cos(3*pi/2+a),2+r*sin(3*pi/2+a))</definition>
+  <coordinates bbox="(-3,-3,7,7)">
+    <line at="AC" endpoints="(A,C)" stroke="black" rotate="-45" offset="(0,5)" tactile-offset="(0,20)"><m>b</m></line>
+    <line at="BC" endpoints="(C,b)" stroke="blue" rotate="30"  offset="(0,5)"><m>a</m></line>
+    <line at="AB" endpoints="(A,B)" stroke="black" dash="9 9" />
+    <point p="A" alignment="southwest"><m>A</m></point>
+    <point p="C" alignment="north"><m>C</m></point>
+    <angle-marker at="beta" points="(B,A,C)" thickness="1"/>
+    <arc at="circle" center="C" radius="r" range="(190,350)" stroke="blue" dash="9 9" thickness="1" />
+  </coordinates>
+<annotations>
+  <annotation ref="figure" text="An incomplete triangle diagram">
+    <annotation ref="AC" text="A line segment from A to C is labeled b "/>
+    <annotation ref="AB" text="The side extending horizontally from A is dashed."/>
+    <annotation ref="BC" text="A blue line segment out straight down from C is labeled a"/>
+    <annotation ref="circle" text="A part of a dashed blue circle centered at C with radius of length a. The radius is so large it meets the dashed line in exactly one place."/>
+  </annotation>
+ </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency1.xml b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency1.xml
new file mode 100644
index 000000000..5afb2fb58
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency1.xml
@@ -0,0 +1,24 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>A=(-2,0)</definition>
+<definition>B=(4,0)</definition>
+<definition>C=(0,3)</definition>
+  <coordinates bbox="(-3,-1,5,4)">
+    <line at="AC" endpoints="(A,C)" stroke="black" rotate="-60" offset="(0,4)" tactile-offset="(0,20)"><m>b</m></line>
+    <line at="BC" endpoints="(C,B)" stroke="black" rotate="50"  offset="(0,20)"><m>a=10</m></line>
+    <line at="AB" endpoints="(A,B)" stroke="black" offset="(0,-20)"><m>c</m></line>
+    <point p="A" alignment="southwest"><m>A</m></point>
+    <point p="B" alignment="east"><m>B</m></point>
+    <point p="C" alignment="north"><m>C</m></point>
+    <angle-marker at="alpha" points="(C,B,A)" thickness="1"><m>25^\circ</m></angle-marker>
+    <angle-marker at="beta" points="(B,A,C)" thickness="1"><m>35^\circ</m></angle-marker>
+  </coordinates>
+<annotations>
+  <annotation ref="figure" text="Triangle ABC">
+    <annotation ref="AC" text="The side from A to C is labeled b"/>
+    <annotation ref="BC" text="The side from B to C is labeled a equals 10"/>
+    <annotation ref="AB" text="The side from A to B is labeled c"/>
+    <annotation ref="alpha" text="Angle B is labeled 25 degrees"/>
+    <annotation ref="beta" text="Angle A is labeled 35 degrees"/>
+  </annotation>
+ </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency12.xml b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency12.xml
new file mode 100644
index 000000000..d4d49d275
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency12.xml
@@ -0,0 +1,24 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>A=(-2,0)</definition>
+<definition>B=(4,0)</definition>
+<definition>C=(0,3)</definition>
+  <coordinates bbox="(-3,-1,5,4)">
+    <line at="AC" endpoints="(A,C)" stroke="black" rotate="-60" offset="(0,4)" tactile-offset="(0,20)"><m>b</m></line>
+    <line at="BC" endpoints="(C,B)" stroke="black" rotate="50"  offset="(0,20)"><m>a</m></line>
+    <line at="AB" endpoints="(A,B)" stroke="black" offset="(0,-20)"><m>c=9</m></line>
+    <point p="A" alignment="southwest"><m>A</m></point>
+    <point p="B" alignment="east"><m>B</m></point>
+    <point p="C" alignment="north"><m>C</m></point>
+    <angle-marker at="alpha" points="(C,B,A)" thickness="1"><m>34^\circ</m></angle-marker>
+    <angle-marker at="beta" points="(B,A,C)" thickness="1"><m>76^\circ</m></angle-marker>
+  </coordinates>
+<annotations>
+  <annotation ref="figure" text="Triangle ABC">
+    <annotation ref="AC" text="The side from A to C is labeled b"/>
+    <annotation ref="BC" text="The side from B to C is labeled a"/>
+    <annotation ref="AB" text="The side from A to B is labeled c equals 9"/>
+    <annotation ref="alpha" text="Angle B is labeled 34 degrees"/>
+    <annotation ref="beta" text="Angle A is labeled 76 degrees"/>
+  </annotation>
+ </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency2.xml b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency2.xml
new file mode 100644
index 000000000..44036168c
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency2.xml
@@ -0,0 +1,24 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>A=(-2,0)</definition>
+<definition>B=(4,0)</definition>
+<definition>C=(0,3)</definition>
+  <coordinates bbox="(-3,-1,5,4)">
+    <line at="AC" endpoints="(A,C)" stroke="black" rotate="-68" offset="(0,25)" tactile-offset="(0,20)"><m>b=16</m></line>
+    <line at="BC" endpoints="(C,B)" stroke="black" rotate="50"  offset="(0,20)"><m>a=7</m></line>
+    <line at="AB" endpoints="(A,B)" stroke="black" offset="(0,-20)" tactile-offset="(0,-50)"><m>c</m></line>
+    <point p="A" alignment="southwest"><m>A</m></point>
+    <point p="B" alignment="east"><m>B</m></point>
+    <point p="C" alignment="north"><m>C</m></point>
+    <angle-marker at="alpha" points="(C,B,A)" thickness="1"><m>34^\circ</m></angle-marker>
+    <angle-marker at="beta" points="(B,A,C)" thickness="1"><m>30^\circ</m></angle-marker>
+  </coordinates>
+<annotations>
+  <annotation ref="figure" text="Triangle ABC">
+    <annotation ref="AC" text="The side from A to C is labeled b equals 16"/>
+    <annotation ref="BC" text="The side from B to C is labeled a equals 7"/>
+    <annotation ref="AB" text="The side from A to B is labeled c"/>
+    <annotation ref="alpha" text="Angle B is labeled 25 degrees"/>
+    <annotation ref="beta" text="Angle A is labeled 30 degrees"/>
+  </annotation>
+ </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency3.xml b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency3.xml
new file mode 100644
index 000000000..c7e77ed40
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency3.xml
@@ -0,0 +1,23 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>A=(-2,0)</definition>
+<definition>B=(4,0)</definition>
+<definition>C=(0,3)</definition>
+  <coordinates bbox="(-3,-1,5,4)">
+    <line at="AC" endpoints="(A,C)" stroke="black" rotate="-68" offset="(0,25)" tactile-offset="(0,20)"><m>b=16</m></line>
+    <line at="BC" endpoints="(C,B)" stroke="black" rotate="50"  offset="(0,20)"><m>a=10</m></line>
+    <line at="AB" endpoints="(A,B)" stroke="black" offset="(0,-20)" tactile-offset="(0,-50)"><m>c</m></line>
+    <point p="A" alignment="southwest"><m>A</m></point>
+    <point p="B" alignment="east"><m>B</m></point>
+    <point p="C" alignment="north"><m>C</m></point>
+
+    <angle-marker at="beta" points="(B,A,C)" thickness="1"><m>30^\circ</m></angle-marker>
+  </coordinates>
+<annotations>
+  <annotation ref="figure" text="Triangle ABC">
+    <annotation ref="AC" text="The side from A to C is labeled b equals 16"/>
+    <annotation ref="BC" text="The side from B to C is labeled a equals 10"/>
+    <annotation ref="AB" text="The side from A to B is labeled c"/>
+    <annotation ref="beta" text="Angle A is labeled 30 degrees"/>
+  </annotation>
+ </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency4.xml b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency4.xml
new file mode 100644
index 000000000..d18a1f5f7
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency4.xml
@@ -0,0 +1,23 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>A=(-2,0)</definition>
+<definition>B=(4,0)</definition>
+<definition>C=(0,3)</definition>
+  <coordinates bbox="(-3,-1,5,4)">
+    <line at="AC" endpoints="(A,C)" stroke="black" rotate="-68" offset="(0,25)" tactile-offset="(0,20)"><m>b=16</m></line>
+    <line at="BC" endpoints="(C,B)" stroke="black" rotate="50"  offset="(0,20)"><m>a=20</m></line>
+    <line at="AB" endpoints="(A,B)" stroke="black" offset="(0,-20)" tactile-offset="(0,-50)"><m>c</m></line>
+    <point p="A" alignment="southwest"><m>A</m></point>
+    <point p="B" alignment="east"><m>B</m></point>
+    <point p="C" alignment="north"><m>C</m></point>
+
+    <angle-marker at="beta" points="(B,A,C)" thickness="1"><m>30^\circ</m></angle-marker>
+  </coordinates>
+<annotations>
+  <annotation ref="figure" text="Triangle ABC">
+    <annotation ref="AC" text="The side from A to C is labeled b equals 16"/>
+    <annotation ref="BC" text="The side from B to C is labeled a equals 20"/>
+    <annotation ref="AB" text="The side from A to B is labeled c"/>
+    <annotation ref="beta" text="Angle A is labeled 30 degrees"/>
+  </annotation>
+ </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency5.xml b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency5.xml
new file mode 100644
index 000000000..c17191e6a
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines-fluency5.xml
@@ -0,0 +1,22 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>A=(-2,0)</definition>
+<definition>B=(4,0)</definition>
+<definition>C=(0,3)</definition>
+  <coordinates bbox="(-3,-1,5,4)">
+    <line at="AC" endpoints="(A,C)" stroke="black" rotate="-68" offset="(0,25)" tactile-offset="(0,20)"><m>b=14</m></line>
+    <line at="BC" endpoints="(C,B)" stroke="black" rotate="50"  offset="(0,10)"><m>a</m></line>
+    <line at="AB" endpoints="(A,B)" stroke="black" offset="(0,-20)"><m>c=7</m></line>
+    <point p="A" alignment="southwest"><m>A</m></point>
+    <point p="B" alignment="east"><m>B</m></point>
+    <point p="C" alignment="north"><m>C</m></point>
+    <angle-marker at="beta" points="(B,A,C)" thickness="1"><m>70^\circ</m></angle-marker>
+  </coordinates>
+<annotations>
+  <annotation ref="figure" text="Triangle ABC">
+    <annotation ref="AC" text="The side from A to C is labeled b equals 14"/>
+    <annotation ref="BC" text="The side from B to C is labeled a"/>
+    <annotation ref="AB" text="The side from A to B is labeled c equals 7"/>
+    <annotation ref="beta" text="Angle A is labeled 70 degrees"/>
+  </annotation>
+ </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines.xml b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines.xml
new file mode 100644
index 000000000..951d50ecd
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE5-law-of-sines.xml
@@ -0,0 +1,28 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+<definition>A=(-2,0)</definition>
+<definition>B=(4,0)</definition>
+<definition>C=(0,3)</definition>
+<definition>D=(0,0)</definition>
+  <coordinates bbox="(-3,-1,5,4)">
+    <group at="ABC">
+    <line at="CD" endpoints="(C,D)" stroke="blue" rotate="90" offset="(0,4)"><m>h</m></line>
+    <line at="AC" endpoints="(A,C)" stroke="black" rotate="-60" offset="(0,4)" tactile-offset="(0,20)"><m>b</m></line>
+    <line at="BC" endpoints="(C,B)" stroke="black" rotate="50" offset="(0,2)"><m>a</m></line>
+    <line at="AB" endpoints="(A,B)" stroke="black" offset="(0,-20)"><m>c</m></line>
+    <point p="A" alignment="southwest"><m>A</m></point>
+    <point p="B" alignment="east"><m>B</m></point>
+    <point p="C" alignment="north"><m>C</m></point>
+    <point at="D" p="D" alignment="south"><m>D</m></point>
+    </group>
+  </coordinates>
+<annotations>
+  <annotation ref="figure" text="Triangle ABC with an altitude from C to D.">
+      <annotation ref="AC" text="The side from A to C is labeled b"/>
+      <annotation ref="BC" text="The side from B to C is labeled a"/>
+      <annotation ref="AB" text="The side from A to B is labeled c"/>
+      <annotation ref="CD" text="The altitude from C to D is labeled h">
+        <annotation ref="D" text="The point labeled D lies along AB and directly below C so that the sides labeled c and h are at a right angle."/>
+          </annotation>
+  </annotation>
+ </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/08-TE/prefigure/TE6-elevation-depression.xml b/source/precalculus/source/08-TE/prefigure/TE6-elevation-depression.xml
new file mode 100644
index 000000000..56d0ba76f
--- /dev/null
+++ b/source/precalculus/source/08-TE/prefigure/TE6-elevation-depression.xml
@@ -0,0 +1,18 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <coordinates bbox="(-1,-1,10,10)">
+    <line at="l1" endpoints="((0,9),(9,9))"/>
+    <line at="l2" endpoints="((9,9),(0,0))"/>
+    <line at="l3" endpoints="((0,0),(9,0))"/>
+    <angle-marker at="d" thickness="1" stroke="blue" points="((0,9),(9,9),(0,0))">Angle of depression</angle-marker>
+    <angle-marker at="e" thickness="1" stroke="blue" points="((9,0),(0,0),(9,9))">Angle of elevation</angle-marker>
+  </coordinates>
+<annotations>
+    <annotation ref="figure" text="Diagram showing the angle of depression and the angle of inclination">
+      <annotation ref="l1" text="A horizontal line"/>
+      <annotation ref="l2" text="A line angling down and to the left"/>
+      <annotation ref="l3" text="A horizontal line"/>
+      <annotation ref="d" text="The angle a line makes below the horizontal is labeled the angle of depression"/>
+      <annotation ref="e" text="The angle a line makes above the horizontal is labeled the angle of elevation"/>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/graphs.ptx b/source/precalculus/source/meta/graphs.ptx
index ae1fbdfae..fa7503d3a 100644
--- a/source/precalculus/source/meta/graphs.ptx
+++ b/source/precalculus/source/meta/graphs.ptx
@@ -7,29 +7,37 @@
             <sidebyside>
                 <figure xml:id="graph-x">
                     <caption>Graph of <m>y=x</m></caption>
-                    <image><sageplot>
-                        plot(x,xmin=-5,xmax=5,ymin=-5,ymax=5,thickness=3,aspect_ratio=1,gridlines=True, ticks=[1,1])
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-x">
+                            <xi:include href="prefigure/graphx.xml"/>
+                        </prefigure>
+                </image>
                 </figure>
                 <figure xml:id="graph-x-squared">
                     <caption>Graph of <m>y=x^2</m></caption>
-                    <image><sageplot>
-                        plot(x^2,xmin=-5,xmax=5,ymin=-5,ymax=5,thickness=3,aspect_ratio=1,gridlines=True, ticks=[1,1])
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-x2">
+                            <xi:include href="prefigure/graphx2.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
             </sidebyside>
             <sidebyside>
                 <figure xml:id="graph-x-cubed">
                     <caption>Graph of <m>y=x^3</m></caption>
-                    <image><sageplot>
-                        plot(x^3,xmin=-5,xmax=5,ymin=-5,ymax=5,thickness=3,aspect_ratio=1,gridlines=True, ticks=[1,1])
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-x3">
+                            <xi:include href="prefigure/graphx3.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
                 <figure xml:id="graph-x-fourth">
                     <caption>Graph of <m>y=x^4</m></caption>
-                    <image><sageplot>
-                        plot(x^4,xmin=-5,xmax=5,ymin=-5,ymax=5,thickness=3,aspect_ratio=1,gridlines=True, ticks=[1,1])
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-x4">
+                            <xi:include href="prefigure/graphx4.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
             </sidebyside>
         </sbsgroup>
@@ -40,42 +48,37 @@
             <sidebyside>
                 <figure xml:id="graph-x-minus-one">
                     <caption>Graph of <m>y=\dfrac{1}{x}</m></caption>
-                    <image><sageplot>
-                        p=plot(1/x,xmin=-5,xmax=5,ymin=-5,ymax=5,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,1])
-                        p+=line([(0,-5),(0,5)],thickness=3,linestyle='dashed',color='red')
-                        p+=line([(-5,0),(5,0)],thickness=3,linestyle='dashed',color='red')
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-x-minus1">
+                            <xi:include href="prefigure/graphx-minus1.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
                 <figure xml:id="graph-x-minus-2">
                     <caption>Graph of <m>y=\dfrac{1}{x^2}</m></caption>
-                    <image><sageplot>
-                        p=plot(1/x^2,xmin=-5,xmax=5,ymin=-5,ymax=5,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,1])
-                        p+=line([(0,-5),(0,5)],thickness=3,linestyle='dashed',color='red')
-                        p+=line([(-5,0),(5,0)],thickness=3,linestyle='dashed',color='red')
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-x-minus2">
+                            <xi:include href="prefigure/graphx-minus2.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
             </sidebyside>
             <sidebyside>
                 <figure xml:id="graph-x-minus-three">
                     <caption>Graph of <m>y=\dfrac{1}{x^3}</m></caption>
-                    <image><sageplot>
-                        p=plot(1/x^3,xmin=-5,xmax=5,ymin=-5,ymax=5,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,1])
-                        p+=line([(0,-5),(0,5)],thickness=3,linestyle='dashed',color='red')
-                        p+=line([(-5,0),(5,0)],thickness=3,linestyle='dashed',color='red')
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-x-minus3">
+                            <xi:include href="prefigure/graphx-minus3.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
                 <figure xml:id="graph-x-minus-four">
                     <caption>Graph of <m>y=\dfrac{1}{x^4}</m></caption>
-                    <image><sageplot>
-                        p=plot(1/x^4,xmin=-5,xmax=-0.1,ymin=-5,ymax=5,thickness=3,aspect_ratio=1,gridlines=True, ticks=[1,1])
-                        p+=plot(1/x^4,xmin=0.1,xmax=5,ymin=-5,ymax=5,thickness=3)
-                        p+=line([(0,-5),(0,5)],thickness=3,linestyle='dashed',color='red')
-                        p+=line([(-5,0),(5,0)],thickness=3,linestyle='dashed',color='red')
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-x-minus4">
+                            <xi:include href="prefigure/graphx-minus4.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
             </sidebyside>
         </sbsgroup>
@@ -86,17 +89,19 @@
             <sidebyside>
                 <figure xml:id="graph-absolute">
                     <caption>Graph of <m>y=|x|</m></caption>
-                    <image><sageplot>
-                        plot(abs(x),xmin=-5,xmax=5,ymin=-5,ymax=5,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,1])
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-absolute">
+                            <xi:include href="prefigure/graph-absolute.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
                 <figure xml:id="graph-sqrt">
                     <caption>Graph of <m>y=\sqrt{x}</m></caption>
-                    <image><sageplot>
-                        p=plot(sqrt(x),xmin=-5,xmax=5,ymin=-5,ymax=5,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,1])
-                        p.SHOW_OPTIONS['xmin']=-5
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-square-root">
+                            <xi:include href="prefigure/graph-square-root.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
             </sidebyside>
         </sbsgroup>
@@ -107,39 +112,37 @@
             <sidebyside>
                 <figure xml:id="graph-exponential">
                     <caption>Graph of <m>y=b^x</m>, with <m>b=2</m></caption>
-                    <image><sageplot>
-                        p=plot(2^x,xmin=-5,xmax=5,ymin=-5,ymax=5,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,1])
-                        p+=line([(-5,0),(5,0)],thickness=3,linestyle='dashed',color='red')
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-exponential">
+                            <xi:include href="prefigure/graph-exponential.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
                 <figure xml:id="graph-log">
                     <caption>Graph of <m>y=\log_b x</m>, with <m>b=2</m></caption>
-                    <image><sageplot>
-                        p=plot(log(x)/log(2),xmin=0,xmax=5,ymin=-5,ymax=5,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,1])
-                        p+=line([(0,-5),(0,5)],thickness=3,linestyle='dashed',color='red')
-                        p.SHOW_OPTIONS['xmin']=-5
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-logarithm">
+                            <xi:include href="prefigure/graph-logarithm.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
             </sidebyside>
             <sidebyside>
                 <figure xml:id="graph-e">
                     <caption>Graph of <m>y=e^x</m></caption>
-                    <image><sageplot>
-                        p=plot(e^x,xmin=-5,xmax=5,ymin=-5,ymax=5,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,1])
-                        p+=line([(-5,0),(5,0)],thickness=3,linestyle='dashed',color='red')
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-exponential-e">
+                            <xi:include href="prefigure/graph-exponentiale.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
                 <figure xml:id="graph-ln">
                     <caption>Graph of <m>y=\ln x</m></caption>
-                    <image><sageplot>
-                        p=plot(log(x),xmin=0,xmax=5,ymin=-5,ymax=5,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,1])
-                        p+=line([(0,-5),(0,5)],thickness=3,linestyle='dashed',color='red')
-                        p.SHOW_OPTIONS['xmin']=-5
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-logarithm-natural">
+                            <xi:include href="prefigure/graph-logarithm-natural.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
             </sidebyside>
         </sbsgroup>
@@ -150,61 +153,55 @@
             <sidebyside>
                 <figure xml:id="graph-sin">
                     <caption>Graph of <m>y=\sin(x)</m></caption>
-                    <image><sageplot>
-<xi:include parse="text" href="../../../common/sagemath/library.sage"/>
-TBIL.trig_plot(sin(x),(x,-2*pi,2*pi),ymin=-2*pi,ymax=2*pi,ticks=[pi/2,1],aspect_ratio=1,gridlines=True)
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-sine">
+                            <xi:include href="prefigure/graph-sin.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
                 <figure xml:id="graph-csc">
                     <caption>Graph of <m>y=\csc x</m></caption>
-                    <image><sageplot>
-<xi:include parse="text" href="../../../common/sagemath/library.sage"/>
-p=TBIL.trig_plot(csc(x),(x,-2*pi,2*pi),ymin=-2*pi,ymax=2*pi,ticks=[pi/2,1],aspect_ratio=1,gridlines=True,detect_poles=True)
-for i in [-2..2]:
-    p+=line([(i*pi,-2*pi),(i*pi,2*pi)],thickness=3,linestyle='dashed',color='red')
-p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-csc">
+                            <xi:include href="prefigure/graph-csc.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
             </sidebyside>
             <sidebyside>
                 <figure xml:id="graph-cos">
                     <caption>Graph of <m>y=\cos x</m></caption>
-                    <image><sageplot>
-<xi:include parse="text" href="../../../common/sagemath/library.sage"/>
-TBIL.trig_plot(cos(x),(x,-2*pi,2*pi),ymin=-2*pi,ymax=2*pi,ticks=[pi/2,1],aspect_ratio=1,gridlines=True)
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-cosine">
+                            <xi:include href="prefigure/graph-cos.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
                 <figure xml:id="graph-sec">
                     <caption>Graph of <m>y=\sec x</m></caption>
-                    <image><sageplot>
-<xi:include parse="text" href="../../../common/sagemath/library.sage"/>
-p=TBIL.trig_plot(sec(x),(x,-2*pi,2*pi),ymin=-2*pi,ymax=2*pi,ticks=[pi/2,1],aspect_ratio=1,gridlines=True,detect_poles=True)
-for i in [-2..1]:
-    p+=line([(i*pi+pi/2,-2*pi),(i*pi+pi/2,2*pi)],thickness=3,linestyle='dashed',color='red')
-p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-sec">
+                            <xi:include href="prefigure/graph-sec.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
             </sidebyside>
             <sidebyside>
                 <figure xml:id="graph-tan">
                     <caption>Graph of <m>y=\tan x</m></caption>
-                    <image><sageplot>
-<xi:include parse="text" href="../../../common/sagemath/library.sage"/>
-p=TBIL.trig_plot(tan(x),(x,-2*pi,2*pi),ymin=-2*pi,ymax=2*pi,ticks=[pi/2,1],aspect_ratio=1,gridlines=True,detect_poles=True)
-for i in [-2..1]:
-    p+=line([(i*pi+pi/2,-2*pi),(i*pi+pi/2,2*pi)],thickness=3,linestyle='dashed',color='red')
-p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-tan">
+                            <xi:include href="prefigure/graph-tan.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
                 <figure xml:id="graph-cot">
                     <caption>Graph of <m>y=\cot x</m></caption>
-                    <image><sageplot>
-<xi:include parse="text" href="../../../common/sagemath/library.sage"/>
-p=TBIL.trig_plot(cot(x),(x,-2*pi,2*pi),ymin=-2*pi,ymax=2*pi,ticks=[pi/2,1],aspect_ratio=1,gridlines=True,detect_poles=True)
-for i in [-2..2]:
-    p+=line([(i*pi,-2*pi),(i*pi,2*pi)],thickness=3,linestyle='dashed',color='red')
-p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-cot">
+                            <xi:include href="prefigure/graph-cot.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
             </sidebyside>
         </sbsgroup>
@@ -215,61 +212,55 @@ p
             <sidebyside>
                 <figure xml:id="graph-arcsin">
                     <caption>Graph of <m>y=\sin^{-1}(x)</m></caption>
-                    <image><sageplot>
-                        p=plot(arcsin(x),xmin=-1,xmax=1,ymin=-pi,ymax=pi,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,pi/4],tick_formatter=[SR(1),pi])
-                        p.SHOW_OPTIONS['xmin']=-pi
-                        p.SHOW_OPTIONS['xmax']=pi
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-arcsin">
+                            <xi:include href="prefigure/graph-arcsin.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
                 <figure xml:id="graph-arccsc">
                     <caption>Graph of <m>y=\csc^{-1}(x)</m></caption>
-                    <image><sageplot>
-                        p=plot(arccsc(x),xmin=-pi,xmax=-1,ymin=-pi,ymax=pi,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,pi/4],tick_formatter=[SR(1),pi])
-                        p+=plot(arccsc(x),xmin=1,xmax=pi,ymin=-pi,ymax=pi,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,pi/4],tick_formatter=[SR(1),pi])
-                        p+=line([(-pi,0),(pi,0)],thickness=3,linestyle='dashed',color='red')
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-arccsc">
+                            <xi:include href="prefigure/graph-arccsc.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
             </sidebyside>
             <sidebyside>
                 <figure xml:id="graph-arccos">
                     <caption>Graph of <m>y=\cos^{-1}(x)</m></caption>
-                    <image><sageplot>
-                        p=plot(arccos(x),xmin=-1,xmax=1,ymin=-pi,ymax=pi,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,pi/4],tick_formatter=[SR(1),pi])
-                        p.SHOW_OPTIONS['xmin']=-pi
-                        p.SHOW_OPTIONS['xmax']=pi
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-arccos">
+                            <xi:include href="prefigure/graph-arccos.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
                 <figure xml:id="graph-arcsec">
                     <caption>Graph of <m>y=\sec^{-1}(x)</m></caption>
-                    <image><sageplot>
-                        p=plot(arcsec(x),xmin=-pi,xmax=-1,ymin=-pi,ymax=pi,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,pi/4],tick_formatter=[SR(1),pi])
-                        p+=plot(arcsec(x),xmin=1,xmax=pi,ymin=-pi,ymax=pi,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,pi/4],tick_formatter=[SR(1),pi])
-                        p+=line([(-pi,pi/2),(pi,pi/2)],thickness=3,linestyle='dashed',color='red')
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-arcsec">
+                            <xi:include href="prefigure/graph-arcsec.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
             </sidebyside>
             <sidebyside>
                 <figure xml:id="graph-arctan">
                     <caption>Graph of <m>y=\tan^{-1}(x)</m></caption>
-                    <image><sageplot>
-                        p=plot(arctan(x),xmin=-pi,xmax=pi,ymin=-pi,ymax=pi,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,pi/4],tick_formatter=[SR(1),pi])
-                        p+=line([(-pi,pi/2),(pi,pi/2)],thickness=3,linestyle='dashed',color='red')
-                        p+=line([(-pi,-pi/2),(pi,-pi/2)],thickness=3,linestyle='dashed',color='red')
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-arctan">
+                            <xi:include href="prefigure/graph-arctan.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
                 <figure xml:id="graph-arccot">
                     <caption>Graph of <m>y=\cot^{-1}(x)</m></caption>
-                    <image><sageplot>
-                        p=plot(arccot(x),xmin=-pi,xmax=-0.001,ymin=-pi,ymax=pi,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,pi/4],tick_formatter=[SR(1),pi])
-                        p+=plot(arccot(x),xmin=0.001,xmax=pi,ymin=-pi,ymax=pi,thickness=3,aspect_ratio=1,detect_poles=True,gridlines=True, ticks=[1,pi/4],tick_formatter=[SR(1),pi])
-                        p+=line([(-pi,0),(pi,0)],thickness=3,linestyle='dashed',color='red')
-                        p
-                    </sageplot></image>
+                    <image>
+                        <prefigure xmlns="https://prefigure.org" label="prefigure-graph-arccot">
+                            <xi:include href="prefigure/graph-arccot.xml"/>
+                        </prefigure>
+                    </image>
                 </figure>
             </sidebyside>
         </sbsgroup>
diff --git a/source/precalculus/source/meta/prefigure/graph-absolute.xml b/source/precalculus/source/meta/prefigure/graph-absolute.xml
new file mode 100644
index 000000000..bdc31387b
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-absolute.xml
@@ -0,0 +1,12 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=fabs(x)</definition>
+  <coordinates bbox="(-5,-5,5,5)">
+    <grid-axes/>
+    <graph at="function" function="f"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals the absolute value of x">
+      <annotation ref="function" text="The function y equals the absolute value of x" sonify="yes"/>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-arccos.xml b/source/precalculus/source/meta/prefigure/graph-arccos.xml
new file mode 100644
index 000000000..93d3b34fe
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-arccos.xml
@@ -0,0 +1,12 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=acos(x)</definition>
+  <coordinates bbox="(-3,-pi,3,pi)">
+    <grid-axes v-pi-format="yes"/>
+    <graph at="function" function="f"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals inverse cosine of x">
+      <annotation ref="function" text="The function y equals inverse cosine of x" sonify="yes"/>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-arccot.xml b/source/precalculus/source/meta/prefigure/graph-arccot.xml
new file mode 100644
index 000000000..fb177aa07
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-arccot.xml
@@ -0,0 +1,19 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=atan(1/x)</definition>
+  <coordinates bbox="(-3,-pi,3,pi)">
+    <grid-axes v-pi-format="yes"/>
+    <group at="function">
+      <graph function="f" domain="(-5,-0.01)"/>
+      <graph function="f" domain="(0.01,5)"/>
+    </group>
+    <line at="asymptote-h" endpoints="((-3,0),(3,0))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals inverse cotangent of x">
+      <annotation ref="graph-function" text="The graph of y equals inverse cotangent of x and its asymptote">
+        <annotation ref="function" text="The function y equals inverse cotangent of x" sonify="yes"/>
+        <annotation ref="asymptote-h" text="The horizontal asymptote y equals 0"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-arccsc.xml b/source/precalculus/source/meta/prefigure/graph-arccsc.xml
new file mode 100644
index 000000000..28eefac07
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-arccsc.xml
@@ -0,0 +1,16 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=asin(1/x)</definition>
+  <coordinates bbox="(-3,-pi,3,pi)">
+    <grid-axes v-pi-format="yes"/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-h" endpoints="((-3,0),(3,0))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals inverse cosecant of x">
+      <annotation ref="graph-function" text="The graph of y equals inverse cosecant of x and its asymptote">
+        <annotation ref="function" text="The function y equals inverse cosecant of x" sonify="yes"/>
+        <annotation ref="asymptote-h" text="The horizontal asymptote y equals 0"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-arcsec.xml b/source/precalculus/source/meta/prefigure/graph-arcsec.xml
new file mode 100644
index 000000000..b20813c6f
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-arcsec.xml
@@ -0,0 +1,16 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=acos(1/x)</definition>
+  <coordinates bbox="(-3,-pi,3,pi)">
+    <grid-axes v-pi-format="yes"/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-h" endpoints="((-3,pi/2),(3,pi/2))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals inverse secant of x">
+      <annotation ref="graph-function" text="The graph of y equals inverse secant of x and its asymptote">
+        <annotation ref="function" text="The function y equals inverse secant of x" sonify="yes"/>
+        <annotation ref="asymptote-h" text="The horizontal asymptote y equals pi over 2"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-arcsin.xml b/source/precalculus/source/meta/prefigure/graph-arcsin.xml
new file mode 100644
index 000000000..3a2807e92
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-arcsin.xml
@@ -0,0 +1,12 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=asin(x)</definition>
+  <coordinates bbox="(-3,-pi,3,pi)">
+    <grid-axes v-pi-format="yes"/>
+    <graph at="function" function="f"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals inverse sine of x">
+      <annotation ref="function" text="The function y equals inverse sine of x" sonify="yes"/>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-arctan.xml b/source/precalculus/source/meta/prefigure/graph-arctan.xml
new file mode 100644
index 000000000..2cc07ff61
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-arctan.xml
@@ -0,0 +1,18 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=atan(x)</definition>
+  <coordinates bbox="(-3,-pi,3,pi)">
+    <grid-axes v-pi-format="yes"/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-h1" endpoints="((-3,-pi/2),(3,-pi/2))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-h2" endpoints="((-3,pi/2),(3,pi/2))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals inverse tangent of x">
+      <annotation ref="graph-function" text="The graph of y equals inverse tangent of x and its asymptotes">
+        <annotation ref="function" text="The function y equals inverse cosecant of x" sonify="yes"/>
+        <annotation ref="asymptote-h1" text="The horizontal asymptote y equals negative pi over 2"/>
+        <annotation ref="asymptote-h2" text="The horizontal asymptote y equals pi over 2"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-cos.xml b/source/precalculus/source/meta/prefigure/graph-cos.xml
new file mode 100644
index 000000000..089d047c9
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-cos.xml
@@ -0,0 +1,12 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=cos(x)</definition>
+  <coordinates bbox="(-2*pi,-5,2*pi,5)">
+    <grid-axes h-pi-format="yes"/>
+    <graph at="function" function="f"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals cosine of x">
+      <annotation ref="function" text="The function y equals cosine of x" sonify="yes"/>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-cot.xml b/source/precalculus/source/meta/prefigure/graph-cot.xml
new file mode 100644
index 000000000..0c18fd78e
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-cot.xml
@@ -0,0 +1,24 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=1/tan(x)</definition>
+  <coordinates bbox="(-2*pi,-5,2*pi,5)">
+    <grid-axes h-pi-format="yes"/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-v1" endpoints="((-2*pi,-5),(-2*pi,5))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v2" endpoints="((-pi,-5),(-pi,5))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v3" endpoints="((0,-5),(0,5))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v4" endpoints="((pi,-5),(pi,5))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v5" endpoints="((2*pi,-5),(2*pi,5))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals cotangent of x">
+      <annotation ref="graph-function" text="The graph of y equals cotangent of x and its asymptotes">
+        <annotation ref="function" text="The function y equals cotangent of x" sonify="yes"/>
+        <annotation ref="asymptote-v1" text="The vertical asymptote x equals negative 2 pi"/>
+        <annotation ref="asymptote-v2" text="The vertical asymptote x equals negative pi"/>
+        <annotation ref="asymptote-v3" text="The vertical asymptote x equals zero"/>
+        <annotation ref="asymptote-v4" text="The vertical asymptote x equals pi"/>
+        <annotation ref="asymptote-v5" text="The vertical asymptote x equals 2 pi"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-csc.xml b/source/precalculus/source/meta/prefigure/graph-csc.xml
new file mode 100644
index 000000000..e96206eb1
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-csc.xml
@@ -0,0 +1,24 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=1/sin(x)</definition>
+  <coordinates bbox="(-2*pi,-5,2*pi,5)">
+    <grid-axes h-pi-format="yes"/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-v1" endpoints="((-2*pi,-5),(-2*pi,5))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v2" endpoints="((-pi,-5),(-pi,5))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v3" endpoints="((0,-5),(0,5))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v4" endpoints="((pi,-5),(pi,5))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v5" endpoints="((2*pi,-5),(2*pi,5))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals cosecant of x">
+      <annotation ref="graph-function" text="The graph of y equals cosecant of x and its asymptotes">
+        <annotation ref="function" text="The function y equals cosecant of x" sonify="yes"/>
+        <annotation ref="asymptote-v1" text="The vertical asymptote x equals negative 2 pi"/>
+        <annotation ref="asymptote-v2" text="The vertical asymptote x equals negative pi"/>
+        <annotation ref="asymptote-v3" text="The vertical asymptote x equals zero"/>
+        <annotation ref="asymptote-v4" text="The vertical asymptote x equals pi"/>
+        <annotation ref="asymptote-v5" text="The vertical asymptote x equals 2 pi"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-exponential.xml b/source/precalculus/source/meta/prefigure/graph-exponential.xml
new file mode 100644
index 000000000..2349a2ce2
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-exponential.xml
@@ -0,0 +1,16 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=2^x</definition>
+  <coordinates bbox="(-5,-5,5,5)">
+    <grid-axes/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-h" endpoints="((-5,0),(5,0))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals 2 to the x">
+      <annotation ref="graph-function" text="The graph of y equals 2 to the x and its asymptote">
+        <annotation ref="function" text="The function y equals 2 to the x" sonify="yes"/>
+        <annotation ref="asymptote-h" text="The horizontal asymptote y equals 0"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-exponentiale.xml b/source/precalculus/source/meta/prefigure/graph-exponentiale.xml
new file mode 100644
index 000000000..7ab95850f
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-exponentiale.xml
@@ -0,0 +1,16 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=e^x</definition>
+  <coordinates bbox="(-5,-5,5,5)">
+    <grid-axes/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-h" endpoints="((-5,0),(5,0))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals e to the x">
+      <annotation ref="graph-function" text="The graph of y equals e to the x and its asymptote">
+        <annotation ref="function" text="The function y equals e to the x" sonify="yes"/>
+        <annotation ref="asymptote-h" text="The horizontal asymptote y equals 0"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-logarithm-natural.xml b/source/precalculus/source/meta/prefigure/graph-logarithm-natural.xml
new file mode 100644
index 000000000..9f7b5e044
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-logarithm-natural.xml
@@ -0,0 +1,16 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=log(x)</definition>
+  <coordinates bbox="(-5,-5,5,5)">
+    <grid-axes/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-v" endpoints="((0,-5),(0,5))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals the natural logarithm of x">
+      <annotation ref="graph-function" text="The graph of y equals the natural logarithm of x and its asymptote">
+        <annotation ref="function" text="The function y equals the natural logarithm of x" sonify="yes"/>
+        <annotation ref="asymptote-v" text="The vertical asymptote x equals 0"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-logarithm.xml b/source/precalculus/source/meta/prefigure/graph-logarithm.xml
new file mode 100644
index 000000000..e4b8a9c6c
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-logarithm.xml
@@ -0,0 +1,16 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=log(x)/log(2)</definition>
+  <coordinates bbox="(-5,-5,5,5)">
+    <grid-axes/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-v" endpoints="((0,-5),(0,5))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals log base two of x">
+      <annotation ref="graph-function" text="The graph of y equals log base two of x and its asymptote">
+        <annotation ref="function" text="The function y equals log base two of x" sonify="yes"/>
+        <annotation ref="asymptote-v" text="The vertical asymptote x equals 0"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-sec.xml b/source/precalculus/source/meta/prefigure/graph-sec.xml
new file mode 100644
index 000000000..a51d4ec05
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-sec.xml
@@ -0,0 +1,22 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=1/cos(x)</definition>
+  <coordinates bbox="(-2*pi,-5,2*pi,5)">
+    <grid-axes h-pi-format="yes"/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-v1" endpoints="((-3*pi/2,-5),(-3*pi/2,5))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v2" endpoints="((-pi/2,-5),(-pi/2,5))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v3" endpoints="((pi/2,-5),(pi/2,5))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v4" endpoints="((3*pi/2,-5),(3*pi/2,5))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals secant of x">
+      <annotation ref="graph-function" text="The graph of y equals secant of x and its asymptotes">
+        <annotation ref="function" text="The function y equals secant of x" sonify="yes"/>
+        <annotation ref="asymptote-v1" text="The vertical asymptote x equals negative 3 pi over 2"/>
+        <annotation ref="asymptote-v2" text="The vertical asymptote x equals negative pi over 2"/>
+        <annotation ref="asymptote-v3" text="The vertical asymptote x equals pi over 2"/>
+        <annotation ref="asymptote-v4" text="The vertical asymptote x equals 3 pi over 2"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-sin.xml b/source/precalculus/source/meta/prefigure/graph-sin.xml
new file mode 100644
index 000000000..ce17bb23f
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-sin.xml
@@ -0,0 +1,12 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=sin(x)</definition>
+  <coordinates bbox="(-2*pi,-5,2*pi,5)">
+    <grid-axes h-pi-format="yes"/>
+    <graph at="function" function="f"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals sine of x">
+      <annotation ref="function" text="The function y equals sine of x" sonify="yes"/>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-square-root.xml b/source/precalculus/source/meta/prefigure/graph-square-root.xml
new file mode 100644
index 000000000..dd96c3150
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-square-root.xml
@@ -0,0 +1,12 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=sqrt(x)</definition>
+  <coordinates bbox="(-5,-5,5,5)">
+    <grid-axes/>
+    <graph at="function" function="f"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals the square root of x">
+      <annotation ref="function" text="The function y equals the square root of x" sonify="yes"/>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graph-tan.xml b/source/precalculus/source/meta/prefigure/graph-tan.xml
new file mode 100644
index 000000000..734b370fb
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graph-tan.xml
@@ -0,0 +1,22 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=tan(x)</definition>
+  <coordinates bbox="(-2*pi,-5,2*pi,5)">
+    <grid-axes h-pi-format="yes"/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-v1" endpoints="((-3*pi/2,-5),(-3*pi/2,5))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v2" endpoints="((-pi/2,-5),(-pi/2,5))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v3" endpoints="((pi/2,-5),(pi/2,5))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v4" endpoints="((3*pi/2,-5),(3*pi/2,5))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals tangent of x">
+      <annotation ref="graph-function" text="The graph of y equals tangent of x and its asymptotes">
+        <annotation ref="function" text="The function y equals tangent of x" sonify="yes"/>
+        <annotation ref="asymptote-v1" text="The vertical asymptote x equals negative 3 pi over 2"/>
+        <annotation ref="asymptote-v2" text="The vertical asymptote x equals negative pi over 2"/>
+        <annotation ref="asymptote-v3" text="The vertical asymptote x equals pi over 2"/>
+        <annotation ref="asymptote-v4" text="The vertical asymptote x equals 3 pi over 2"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graphx-minus1.xml b/source/precalculus/source/meta/prefigure/graphx-minus1.xml
new file mode 100644
index 000000000..c10169525
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graphx-minus1.xml
@@ -0,0 +1,18 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=x^(-1)</definition>
+  <coordinates bbox="(-5,-5,5,5)">
+    <grid-axes/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-h" endpoints="((-5,0),(5,0))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v" endpoints="((0,-5),(0,5))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals 1 over x">
+      <annotation ref="graph-function" text="The graph of y equals 1 over x and its asymptotes">
+        <annotation ref="function" text="The function y equals 1 over x" sonify="yes"/>
+        <annotation ref="asymptote-h" text="The horizontal asymptote y equals 0"/>
+        <annotation ref="asymptote-v" text="The vertical asymptote x equals 0"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graphx-minus2.xml b/source/precalculus/source/meta/prefigure/graphx-minus2.xml
new file mode 100644
index 000000000..bfe239545
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graphx-minus2.xml
@@ -0,0 +1,18 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=x^(-2)</definition>
+  <coordinates bbox="(-5,-5,5,5)">
+    <grid-axes/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-h" endpoints="((-5,0),(5,0))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v" endpoints="((0,-5),(0,5))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals 1 over x squared">
+      <annotation ref="graph-function" text="The graph of y equals 1 over x squared and its asymptotes">
+        <annotation ref="function" text="The function y equals 1 over x squared" sonify="yes"/>
+        <annotation ref="asymptote-h" text="The horizontal asymptote y equals 0"/>
+        <annotation ref="asymptote-v" text="The vertical asymptote x equals 0"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graphx-minus3.xml b/source/precalculus/source/meta/prefigure/graphx-minus3.xml
new file mode 100644
index 000000000..3fc4b893d
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graphx-minus3.xml
@@ -0,0 +1,18 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=x^(-3)</definition>
+  <coordinates bbox="(-5,-5,5,5)">
+    <grid-axes/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-h" endpoints="((-5,0),(5,0))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v" endpoints="((0,-5),(0,5))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals 1 over x cubed">
+      <annotation ref="graph-function" text="The graph of y equals 1 over x cubed and its asymptotes">
+        <annotation ref="function" text="The function y equals 1 over x cubed" sonify="yes"/>
+        <annotation ref="asymptote-h" text="The horizontal asymptote y equals 0"/>
+        <annotation ref="asymptote-v" text="The vertical asymptote x equals 0"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graphx-minus4.xml b/source/precalculus/source/meta/prefigure/graphx-minus4.xml
new file mode 100644
index 000000000..651c0f04c
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graphx-minus4.xml
@@ -0,0 +1,18 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=x^(-3)</definition>
+  <coordinates bbox="(-5,-5,5,5)">
+    <grid-axes/>
+    <graph at="function" function="f"/>
+    <line at="asymptote-h" endpoints="((-5,0),(5,0))" stroke="red" infinite = "yes" dash="9 9"/>
+    <line at="asymptote-v" endpoints="((0,-5),(0,5))" stroke="red" infinite = "yes" dash="9 9"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals 1 over x to the fourth">
+      <annotation ref="graph-function" text="The graph of y equals 1 over x to the fourth and its asymptotes">
+        <annotation ref="function" text="The function y equals 1 over x to the fourth" sonify="yes"/>
+        <annotation ref="asymptote-h" text="The horizontal asymptote y equals 0"/>
+        <annotation ref="asymptote-v" text="The vertical asymptote x equals 0"/>
+      </annotation>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graphx.xml b/source/precalculus/source/meta/prefigure/graphx.xml
new file mode 100644
index 000000000..b1d7308a4
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graphx.xml
@@ -0,0 +1,12 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=x</definition>
+  <coordinates bbox="(-5,-5,5,5)">
+    <grid-axes/>
+    <graph at="function" function="f"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals x">
+      <annotation ref="function" text="The function y equals x" sonify="yes"/>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graphx2.xml b/source/precalculus/source/meta/prefigure/graphx2.xml
new file mode 100644
index 000000000..074613453
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graphx2.xml
@@ -0,0 +1,12 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=x^2</definition>
+  <coordinates bbox="(-5,-5,5,5)">
+    <grid-axes/>
+    <graph at="function" function="f"/>
+  </coordinates>
+    <annotations>
+    <annotation ref="figure" text="The graph of the function y equals x squared">
+      <annotation ref="function" text="The function y equals x squared" sonify="yes"/>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graphx3.xml b/source/precalculus/source/meta/prefigure/graphx3.xml
new file mode 100644
index 000000000..0187b56b9
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graphx3.xml
@@ -0,0 +1,12 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=x^3</definition>
+  <coordinates bbox="(-5,-5,5,5)">
+    <grid-axes/>
+    <graph at="function" function="f"/>
+  </coordinates>
+    <annotations>
+    <annotation ref="figure" text="The graph of the function y equals x cubed">
+      <annotation ref="function" text="The function y equals x cubed" sonify="yes"/>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file
diff --git a/source/precalculus/source/meta/prefigure/graphx4.xml b/source/precalculus/source/meta/prefigure/graphx4.xml
new file mode 100644
index 000000000..95bd0fff8
--- /dev/null
+++ b/source/precalculus/source/meta/prefigure/graphx4.xml
@@ -0,0 +1,12 @@
+<diagram dimensions="(300,300)" margins="5" xmlns="https://prefigure.org">
+  <definition>f(x)=x^3</definition>
+  <coordinates bbox="(-5,-5,5,5)">
+    <grid-axes/>
+    <graph at="function" function="f"/>
+  </coordinates>
+  <annotations>
+    <annotation ref="figure" text="The graph of the function y equals x to the fourth">
+      <annotation ref="function" text="The function y equals x to the fourth" sonify="yes"/>
+    </annotation>
+  </annotations>
+</diagram>
\ No newline at end of file