diff --git a/changelog.html b/changelog.html
index 3dc0be7..fdfaf43 100644
--- a/changelog.html
+++ b/changelog.html
@@ -17,6 +17,8 @@
             <h2 id="171129"><a href="#171129">Nov 29, 2017</a> </h2>
             <h3 id="1711291"><a href="#1711291">Updated 'Level Select' for PAL</a></h3>
             <p>Fixed Pinna not resetting inside the park.</p>
+            <h3 id="1711292"><a href="#1711292">Updated 'Shine Touch Timer' and 'Shine Get Timer'</a></h3>
+            <p>Made timers stop after the bowser fight when hitting the last platform.</p>
             <h2 id="171112"><a href="#171112">Nov 12, 2017</a> </h2>
             <h3 id="1711121"><a href="#1711121">Updated 'Free Pause'</a></h3>
             <p>Fixed 'Free Pause' incompatibility with 'Shine Get Timer' caused by them injecting code in the same address.</p>
diff --git a/changelog.xml b/changelog.xml
index 0d4d363..30155c7 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -2,7 +2,7 @@
 <updates>
    <update>
       <date>Nov 29, 2017</date>
-      <change>Fixed Pinna not resetting inside the park on PAL.</change>
+      <change>Made timers stop after the bowser fight and fixed Pinna not resetting inside the park on PAL</change>
    </update>
    <update>
       <date>Nov 12, 2017</date>
diff --git a/codes/GMSE01.xml b/codes/GMSE01.xml
index af2cb8b..ff6f2d7 100644
--- a/codes/GMSE01.xml
+++ b/codes/GMSE01.xml
@@ -123,8 +123,8 @@
     <code>
         <title lang="en">Shine Touch Timer</title>
         <author>Psychonauter</author>
-        <version>1.5</version>
-        <date>Nov 06, 2017</date>
+        <version>1.6</version>
+        <date>Nov 29, 2017</date>
         <description><![CDATA[Adds the ingame timer to every level, starting on the last black frame after the loading screen and ending when you touch a Shine.<br /><br /><b><font color ="#ff8297">Requires the Level Select code to be active.</font></b>]]></description>
         <source>
             C2031F68 0000000F
@@ -193,6 +193,17 @@
             3C60817F 60630100
             38800101 B0830000
             807F025C 00000000
+            C2031F6C 0000000A
+            3C60803E 60639710
+            A083FFFE 2C043C00
+            40A20038 A0830002
+            2C040FFF 40A2002C
+            7C1E0378 7FE802A6
+            3C608056 6063DD00
+            3C808028 6084E604
+            7C8803A6 4E800021
+            7FE803A6 7FC0F378
+            83E1001C 00000000
             04348048 4E800020
             0414A99C 60000000
             0414D2E8 60000000
@@ -214,9 +225,9 @@
     <code>
         <title lang="en">Shine Get Timer</title>
         <author>Psychonauter</author>
-        <version>1.5</version>
+        <version>1.6</version>
         <description><![CDATA[Adds the ingame timer to every level, starting on the last black frame after the loading screen and ending as soon as the 'Shine Get' animation starts (Similiar to the x-cam timer of SM64). <br /><br /><b><font color ="#ff8297">Requires the Level Select code to be active.</font></b>]]></description>
-        <date>Nov 06, 2017</date>
+        <date>Nov 29, 2017</date>
         <source>
             C2031F68 0000000F
             3CC0817F 60C60100
@@ -293,6 +304,17 @@
             3C60817F 60630100
             38800101 B0830000
             807F025C 00000000
+            C2031F6C 0000000A
+            3C60803E 60639710
+            A083FFFE 2C043C00
+            40A20038 A0830002
+            2C040FFF 40A2002C
+            7C1E0378 7FE802A6
+            3C608056 6063DD00
+            3C808028 6084E604
+            7C8803A6 4E800021
+            7FE803A6 7FC0F378
+            83E1001C 00000000
             04348048 4E800020
             0414A99C 60000000
             0414D2E8 60000000
diff --git a/codes/GMSJ01.xml b/codes/GMSJ01.xml
index ce0a4ff..42abc8f 100644
--- a/codes/GMSJ01.xml
+++ b/codes/GMSJ01.xml
@@ -125,8 +125,8 @@
     <code>
         <title lang="en">Shine Touch Timer</title>
         <author>Psychonauter</author>
-        <version>1.5</version>
-        <date>Nov 06, 2017</date>
+        <version>1.6</version>
+        <date>Nov 29, 2017</date>
         <description><![CDATA[Adds the ingame timer to every level, starting on the last black frame after the loading screen and ending when you touch a Shine. <br /><br /><b><font color ="#ff8297">Requires the Level Select code to be active.</font></b>]]></description>
         <source>
             C23617C4 0000000F
@@ -195,6 +195,17 @@
             3C60817F 60630100
             38800101 B0830000
             807F0268 00000000
+            C23617C8 0000000A
+            3C60803E 60636010
+            A083FFFE 2C043C00
+            40A20038 A0830002
+            2C040FFF 40A2002C
+            7C1E0378 7FE802A6
+            3C608056 60639F00
+            3C80800E 60841B4C
+            7C8803A6 4E800021
+            7FE803A6 7FC0F378
+            83E1001C 00000000
             04092968 4E800020
             0420BDF8 60000000
             0420E8A4 60000000
@@ -216,9 +227,9 @@
     <code>
         <title lang="en">Shine Get Timer</title>
         <author>Psychonauter</author>
-        <version>1.5</version>
+        <version>1.6</version>
         <description><![CDATA[Adds the ingame timer to every level, starting on the last black frame after the loading screen and ending as soon as the 'Shine Get' animation starts (Similiar to the x-cam timer of SM64).<br /><br /><b><font color ="#ff8297">Requires the Level Select code to be active.</font></b>]]></description>
-        <date>Nov 06, 2017</date>
+        <date>Nov 29, 2017</date>
         <source>
             C23617C4 0000000F
             3CC0817F 60C60100
@@ -295,6 +306,17 @@
             3C60817F 60630100
             38800101 B0830000
             807F0268 00000000
+            C23617C8 0000000A
+            3C60803E 60636010
+            A083FFFE 2C043C00
+            40A20038 A0830002
+            2C040FFF 40A2002C
+            7C1E0378 7FE802A6
+            3C608056 60639F00
+            3C80800E 60841B4C
+            7C8803A6 4E800021
+            7FE803A6 7FC0F378
+            83E1001C 00000000
             04092968 4E800020
             0420BDF8 60000000
             0420E8A4 60000000
diff --git a/codes/GMSP01.xml b/codes/GMSP01.xml
index 542d44b..5aafe20 100644
--- a/codes/GMSP01.xml
+++ b/codes/GMSP01.xml
@@ -133,8 +133,8 @@
     <code>
         <title lang="en">Shine Touch Timer</title>
         <author>Psychonauter</author>
-        <version>1.5</version>
-        <date>Nov 06, 2017</date>
+        <version>1.6</version>
+        <date>Nov 29, 2017</date>
         <description><![CDATA[Adds the ingame timer to every level, starting on the last black frame after the loading screen and ending when you touch a Shine.<br /><br /><b><font color ="#ff8297">Requires the Level Select code to be active.</font></b>]]></description>
         <source>
             C2032020 0000000F
@@ -203,6 +203,17 @@
             3C60817F 60630100
             38800101 B0830000
             807F084C 00000000
+            C2032024 0000000A
+            3C60803E 606310D0
+            A083FFFE 2C043C00
+            40A20038 A0830002
+            2C040FFF 40A2002C
+            7C1E0378 7FE802A6
+            3C608056 6063DF00
+            3C808028 60846390
+            7C8803A6 4E800021
+            7FE803A6 7FC0F378
+            83E1001C 00000000
             043402A4 4E800020
             0413F62C 60000000
             04141F78 60000000
@@ -224,9 +235,9 @@
     <code>
         <title lang="en">Shine Get Timer</title>
         <author>Psychonauter</author>
-        <version>1.5</version>
+        <version>1.6</version>
         <description><![CDATA[Adds the ingame timer to every level, starting on the last black frame after the loading screen and ending as soon as the 'Shine Get' animation starts (Similiar to the x-cam timer of SM64). <br /><br /><b><font color ="#ff8297">Requires the Level Select code to be active.</font></b>]]></description>
-        <date>Nov 06, 2017</date>
+        <date>Nov 29, 2017</date>
         <source>
             C2032020 0000000F
             3CC0817F 60C60100
@@ -303,6 +314,17 @@
             3C60817F 60630100
             38800101 B0830000
             807F084C 00000000
+            C2032024 0000000A
+            3C60803E 606310D0
+            A083FFFE 2C043C00
+            40A20038 A0830002
+            2C040FFF 40A2002C
+            7C1E0378 7FE802A6
+            3C608056 6063DF00
+            3C808028 60846390
+            7C8803A6 4E800021
+            7FE803A6 7FC0F378
+            83E1001C 00000000
             043402A4 4E800020
             0413F62C 60000000
             04141F78 60000000