diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index 6f3fa792e..3de7349e9 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -1,4 +1,4 @@
-dragonpilot beta3 2023.08.12
+dragonpilot beta3 2023.08.14
 =======================
 * openpilot master branch on 2023.07.21.
 
diff --git a/body/board/obj/body.bin b/body/board/obj/body.bin
index 5d3975846..c6d0a958b 100755
Binary files a/body/board/obj/body.bin and b/body/board/obj/body.bin differ
diff --git a/body/board/obj/body.bin.signed b/body/board/obj/body.bin.signed
index e62050078..66bae094c 100644
Binary files a/body/board/obj/body.bin.signed and b/body/board/obj/body.bin.signed differ
diff --git a/body/board/obj/body.elf b/body/board/obj/body.elf
index 494151bb0..c192109ed 100755
Binary files a/body/board/obj/body.elf and b/body/board/obj/body.elf differ
diff --git a/body/board/obj/bootstub.body.bin b/body/board/obj/bootstub.body.bin
index a32c130d3..cace2c16c 100755
Binary files a/body/board/obj/bootstub.body.bin and b/body/board/obj/bootstub.body.bin differ
diff --git a/body/board/obj/bootstub.body.elf b/body/board/obj/bootstub.body.elf
index ca056c5a3..c64d5f593 100755
Binary files a/body/board/obj/bootstub.body.elf and b/body/board/obj/bootstub.body.elf differ
diff --git a/body/board/obj/gitversion.h b/body/board/obj/gitversion.h
index a8c9fa8af..fef046edc 100644
--- a/body/board/obj/gitversion.h
+++ b/body/board/obj/gitversion.h
@@ -1 +1 @@
-const uint8_t gitversion[8] = "3a753738";
+const uint8_t gitversion[8] = "56e43cbd";
diff --git a/cereal/messaging/__init__.py b/cereal/messaging/__init__.py
index efddea1b1..5a863f130 100644
--- a/cereal/messaging/__init__.py
+++ b/cereal/messaging/__init__.py
@@ -1,7 +1,6 @@
 # must be built with scons
-from .messaging_pyx import Context, Poller, SubSocket, PubSocket, SocketEventHandle, toggle_fake_events, \
-                                set_fake_prefix, get_fake_prefix, delete_fake_prefix, wait_for_one_event
-from .messaging_pyx import MultiplePublishersError, MessagingError
+from .messaging_pyx import Context, Poller, SubSocket, PubSocket, SocketEventHandle, toggle_fake_events, set_fake_prefix, get_fake_prefix, delete_fake_prefix, wait_for_one_event  # pylint: disable=no-name-in-module, import-error
+from .messaging_pyx import MultiplePublishersError, MessagingError  # pylint: disable=no-name-in-module, import-error
 
 import os
 import capnp
diff --git a/cereal/messaging/messaging.h b/cereal/messaging/messaging.h
index d768ccb9b..483b2465c 100644
--- a/cereal/messaging/messaging.h
+++ b/cereal/messaging/messaging.h
@@ -116,18 +116,6 @@ public:
     return heapArray_.asBytes();
   }
 
-  size_t getSerializedSize() {
-    return capnp::computeSerializedSizeInWords(*this) * sizeof(capnp::word);
-  }
-
-  int serializeToBuffer(unsigned char *buffer, size_t buffer_size) {
-    size_t serialized_size = getSerializedSize();
-    if (serialized_size > buffer_size) { return -1; }
-    kj::ArrayOutputStream out(kj::ArrayPtr<capnp::byte>(buffer, buffer_size));
-    capnp::writeMessage(out, *this);
-    return serialized_size;
-  }
-
 private:
   kj::Array<capnp::word> heapArray_;
 };
diff --git a/cereal/visionipc/__init__.py b/cereal/visionipc/__init__.py
index 7adfc58d1..3e11bbbb7 100644
--- a/cereal/visionipc/__init__.py
+++ b/cereal/visionipc/__init__.py
@@ -1,4 +1,4 @@
-from cereal.visionipc.visionipc_pyx import VisionBuf, VisionIpcClient, VisionIpcServer, VisionStreamType, get_endpoint_name
+from cereal.visionipc.visionipc_pyx import VisionBuf, VisionIpcClient, VisionIpcServer, VisionStreamType, get_endpoint_name  # pylint: disable=no-name-in-module, import-error
 assert VisionBuf
 assert VisionIpcClient
 assert VisionIpcServer
diff --git a/cereal/visionipc/visionipc_pyx.so b/cereal/visionipc/visionipc_pyx.so
index a6cd65e3e..8a3d04dd1 100755
Binary files a/cereal/visionipc/visionipc_pyx.so and b/cereal/visionipc/visionipc_pyx.so differ
diff --git a/common/params_pyx.so b/common/params_pyx.so
index a94081911..924ea6768 100755
Binary files a/common/params_pyx.so and b/common/params_pyx.so differ
diff --git a/common/version.h b/common/version.h
index 19674ca1c..e0898120a 100644
--- a/common/version.h
+++ b/common/version.h
@@ -1 +1 @@
-#define COMMA_VERSION "2023.08.12"
+#define COMMA_VERSION "2023.08.14"
diff --git a/laika/astro_dog.py b/laika/astro_dog.py
index 14dd21ac5..a2d01946a 100644
--- a/laika/astro_dog.py
+++ b/laika/astro_dog.py
@@ -40,7 +40,7 @@ class AstroDog:
     for const in valid_const:
       if not isinstance(const, ConstellationId):
         raise TypeError(f"valid_const must be a list of ConstellationId, got {const}")
-
+  
     self.auto_update = auto_update
     self.cache_dir = cache_dir
     self.clear_old_ephemeris = clear_old_ephemeris
diff --git a/laika/downloader.py b/laika/downloader.py
index f1fd69d75..c0bbb584f 100644
--- a/laika/downloader.py
+++ b/laika/downloader.py
@@ -185,7 +185,7 @@ def https_download_file(url):
   crl.setopt(crl.SSL_CIPHER_LIST, 'DEFAULT@SECLEVEL=1')
   crl.setopt(crl.COOKIEJAR, '/tmp/cddis_cookies')
   crl.setopt(pycurl.CONNECTTIMEOUT, 10)
-
+  
   buf = BytesIO()
   crl.setopt(crl.WRITEDATA, buf)
   crl.perform()
diff --git a/laika/ephemeris.py b/laika/ephemeris.py
index 116db01b5..fa8dbdf8d 100644
--- a/laika/ephemeris.py
+++ b/laika/ephemeris.py
@@ -455,7 +455,7 @@ def parse_rinex_nav_msg_glonass(file_name):
     e['n4'], e['nt'], toe_seconds = epoch.as_glonass()
     tb = toe_seconds / (15 * SECS_IN_MIN)
 
-
+  
     e['tb'] = tb
 
     e['tauN'] = -float(line[23:42])
@@ -465,12 +465,12 @@ def parse_rinex_nav_msg_glonass(file_name):
     e['x'], e['xVel'], e['xAccel'], e['svHealth'] = read4(f, rinex_ver)
     e['y'], e['yVel'], e['yAccel'], e['freqNum'] = read4(f, rinex_ver)
     e['z'], e['zVel'], e['zAccel'], e['age'] = read4(f, rinex_ver)
-
+    
     # TODO unclear why glonass sometimes has nav messages 3s after correct one
     if abs(tb - int(tb)) > 1e-3:
       continue
 
-
+    
     data_struct = ephemeris_structs.GlonassEphemeris.new_message(**e)
     ephem = GLONASSEphemeris(data_struct, file_name=file_name)
 
diff --git a/laika/raw_gnss.py b/laika/raw_gnss.py
index 92ae0d858..405a96ef2 100644
--- a/laika/raw_gnss.py
+++ b/laika/raw_gnss.py
@@ -53,8 +53,8 @@ class GNSSMeasurement:
   SAT_POS = slice(8, 11)
   SAT_VEL = slice(11, 14)
 
-  def __init__(self, constellation_id: ConstellationId, sv_id: int, recv_time_week: int, recv_time_sec: float, observables: Dict[str, float],
-               observables_std: Dict[str, float], glonass_freq: Union[int, float, None] = None):
+  def __init__(self, constellation_id: ConstellationId, sv_id: int, recv_time_week: int, recv_time_sec: float, observables: Dict[str, float], observables_std: Dict[str, float],
+               glonass_freq: Union[int, float, None] = None):
     # Metadata
     # prn: unique satellite id
     self.prn = "%s%02d" % (constellation_id.to_rinex_char(), sv_id)  # satellite ID in rinex convention
@@ -201,8 +201,7 @@ def read_raw_qcom(report):
   # logging.debug(recv_time, report.source, time_bias_ms, dr)
   measurements = []
   for i in report.sv:
-    # todo change svId to nmea_id in cereal message. Or better: change the publisher to publish correct svId's, since constellation id is also given
-    nmea_id = i.svId
+    nmea_id = i.svId  # todo change svId to nmea_id in cereal message. Or better: change the publisher to publish correct svId's, since constellation id is also given
     if nmea_id == 255:
       # TODO nmea_id is not valid. Fix publisher
       continue
diff --git a/opendbc/can/libdbc.so b/opendbc/can/libdbc.so
index 8a8031943..ba9be0fb2 100755
Binary files a/opendbc/can/libdbc.so and b/opendbc/can/libdbc.so differ
diff --git a/opendbc/can/parser_pyx.cpp b/opendbc/can/parser_pyx.cpp
index e76b3b4a3..e24fe9838 100644
--- a/opendbc/can/parser_pyx.cpp
+++ b/opendbc/can/parser_pyx.cpp
@@ -1439,7 +1439,7 @@ struct __pyx_obj_7opendbc_3can_10parser_pyx_CANParser {
 };
 
 
-/* "opendbc/can/parser_pyx.pyx":147
+/* "opendbc/can/parser_pyx.pyx":143
  * 
  * 
  * cdef class CANDefine():             # <<<<<<<<<<<<<<
@@ -1467,7 +1467,7 @@ struct __pyx_obj_7opendbc_3can_10parser_pyx___pyx_scope_struct____init__ {
 };
 
 
-/* "opendbc/can/parser_pyx.pyx":92
+/* "opendbc/can/parser_pyx.pyx":88
  *       unchecked = signal_addrs - checked_addrs
  *       if len(unchecked):
  *         err_msg = ", ".join(f"{self.address_to_msg_name[addr].decode()} ({hex(addr)})" for addr in unchecked)             # <<<<<<<<<<<<<<
@@ -1482,7 +1482,7 @@ struct __pyx_obj_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr {
 };
 
 
-/* "opendbc/can/parser_pyx.pyx":102
+/* "opendbc/can/parser_pyx.pyx":98
  *       signal_options_v.push_back(spo)
  * 
  *     message_options = dict((address, 0) for _, address in signals)             # <<<<<<<<<<<<<<
@@ -4010,7 +4010,7 @@ static int __pyx_pw_7opendbc_3can_10parser_pyx_9CANParser_1__init__(PyObject *__
 }
 static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___2generator(__pyx_CoroutineObject *__pyx_generator, CYTHON_UNUSED PyThreadState *__pyx_tstate, PyObject *__pyx_sent_value); /* proto */
 
-/* "opendbc/can/parser_pyx.pyx":92
+/* "opendbc/can/parser_pyx.pyx":88
  *       unchecked = signal_addrs - checked_addrs
  *       if len(unchecked):
  *         err_msg = ", ".join(f"{self.address_to_msg_name[addr].decode()} ({hex(addr)})" for addr in unchecked)             # <<<<<<<<<<<<<<
@@ -4030,7 +4030,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_8__init___genexp
   if (unlikely(!__pyx_cur_scope)) {
     __pyx_cur_scope = ((struct __pyx_obj_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr *)Py_None);
     __Pyx_INCREF(Py_None);
-    __PYX_ERR(0, 92, __pyx_L1_error)
+    __PYX_ERR(0, 88, __pyx_L1_error)
   } else {
     __Pyx_GOTREF((PyObject *)__pyx_cur_scope);
   }
@@ -4041,7 +4041,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_8__init___genexp
   __Pyx_INCREF(__pyx_cur_scope->__pyx_genexpr_arg_0);
   __Pyx_GIVEREF(__pyx_cur_scope->__pyx_genexpr_arg_0);
   {
-    __pyx_CoroutineObject *gen = __Pyx_Generator_New((__pyx_coroutine_body_t) __pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___2generator, NULL, (PyObject *) __pyx_cur_scope, __pyx_n_s_genexpr, __pyx_n_s_init___locals_genexpr, __pyx_n_s_opendbc_can_parser_pyx); if (unlikely(!gen)) __PYX_ERR(0, 92, __pyx_L1_error)
+    __pyx_CoroutineObject *gen = __Pyx_Generator_New((__pyx_coroutine_body_t) __pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___2generator, NULL, (PyObject *) __pyx_cur_scope, __pyx_n_s_genexpr, __pyx_n_s_init___locals_genexpr, __pyx_n_s_opendbc_can_parser_pyx); if (unlikely(!gen)) __PYX_ERR(0, 88, __pyx_L1_error)
     __Pyx_DECREF(__pyx_cur_scope);
     __Pyx_RefNannyFinishContext();
     return (PyObject *) gen;
@@ -4082,34 +4082,34 @@ static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___2gener
     return NULL;
   }
   __pyx_L3_first_run:;
-  if (unlikely(!__pyx_sent_value)) __PYX_ERR(0, 92, __pyx_L1_error)
-  __pyx_r = PyList_New(0); if (unlikely(!__pyx_r)) __PYX_ERR(0, 92, __pyx_L1_error)
+  if (unlikely(!__pyx_sent_value)) __PYX_ERR(0, 88, __pyx_L1_error)
+  __pyx_r = PyList_New(0); if (unlikely(!__pyx_r)) __PYX_ERR(0, 88, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_r);
-  if (unlikely(!__pyx_cur_scope->__pyx_genexpr_arg_0)) { __Pyx_RaiseUnboundLocalError(".0"); __PYX_ERR(0, 92, __pyx_L1_error) }
+  if (unlikely(!__pyx_cur_scope->__pyx_genexpr_arg_0)) { __Pyx_RaiseUnboundLocalError(".0"); __PYX_ERR(0, 88, __pyx_L1_error) }
   if (likely(PyList_CheckExact(__pyx_cur_scope->__pyx_genexpr_arg_0)) || PyTuple_CheckExact(__pyx_cur_scope->__pyx_genexpr_arg_0)) {
     __pyx_t_1 = __pyx_cur_scope->__pyx_genexpr_arg_0; __Pyx_INCREF(__pyx_t_1); __pyx_t_2 = 0;
     __pyx_t_3 = NULL;
   } else {
-    __pyx_t_2 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_cur_scope->__pyx_genexpr_arg_0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 92, __pyx_L1_error)
+    __pyx_t_2 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_cur_scope->__pyx_genexpr_arg_0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 88, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
-    __pyx_t_3 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 92, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 88, __pyx_L1_error)
   }
   for (;;) {
     if (likely(!__pyx_t_3)) {
       if (likely(PyList_CheckExact(__pyx_t_1))) {
         if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_1)) break;
         #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-        __pyx_t_4 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 92, __pyx_L1_error)
+        __pyx_t_4 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 88, __pyx_L1_error)
         #else
-        __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 92, __pyx_L1_error)
+        __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 88, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
         #endif
       } else {
         if (__pyx_t_2 >= PyTuple_GET_SIZE(__pyx_t_1)) break;
         #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-        __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 92, __pyx_L1_error)
+        __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 88, __pyx_L1_error)
         #else
-        __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 92, __pyx_L1_error)
+        __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 88, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
         #endif
       }
@@ -4119,7 +4119,7 @@ static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___2gener
         PyObject* exc_type = PyErr_Occurred();
         if (exc_type) {
           if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
-          else __PYX_ERR(0, 92, __pyx_L1_error)
+          else __PYX_ERR(0, 88, __pyx_L1_error)
         }
         break;
       }
@@ -4129,13 +4129,13 @@ static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___2gener
     __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_addr, __pyx_t_4);
     __Pyx_GIVEREF(__pyx_t_4);
     __pyx_t_4 = 0;
-    __pyx_t_4 = PyTuple_New(4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 92, __pyx_L1_error)
+    __pyx_t_4 = PyTuple_New(4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 88, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __pyx_t_5 = 0;
     __pyx_t_6 = 127;
-    if (unlikely(!__pyx_cur_scope->__pyx_outer_scope->__pyx_v_self)) { __Pyx_RaiseClosureNameError("self"); __PYX_ERR(0, 92, __pyx_L1_error) }
-    __pyx_t_7 = __Pyx_PyInt_As_uint32_t(__pyx_cur_scope->__pyx_v_addr); if (unlikely((__pyx_t_7 == ((uint32_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 92, __pyx_L1_error)
-    __pyx_t_8 = __Pyx_decode_cpp_string((__pyx_cur_scope->__pyx_outer_scope->__pyx_v_self->address_to_msg_name[__pyx_t_7]), 0, PY_SSIZE_T_MAX, NULL, NULL, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 92, __pyx_L1_error)
+    if (unlikely(!__pyx_cur_scope->__pyx_outer_scope->__pyx_v_self)) { __Pyx_RaiseClosureNameError("self"); __PYX_ERR(0, 88, __pyx_L1_error) }
+    __pyx_t_7 = __Pyx_PyInt_As_uint32_t(__pyx_cur_scope->__pyx_v_addr); if (unlikely((__pyx_t_7 == ((uint32_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 88, __pyx_L1_error)
+    __pyx_t_8 = __Pyx_decode_cpp_string((__pyx_cur_scope->__pyx_outer_scope->__pyx_v_self->address_to_msg_name[__pyx_t_7]), 0, PY_SSIZE_T_MAX, NULL, NULL, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 88, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_8);
     __pyx_t_6 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_8) > __pyx_t_6) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_8) : __pyx_t_6;
     __pyx_t_5 += __Pyx_PyUnicode_GET_LENGTH(__pyx_t_8);
@@ -4146,9 +4146,9 @@ static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___2gener
     __pyx_t_5 += 2;
     __Pyx_GIVEREF(__pyx_kp_u_);
     PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_kp_u_);
-    __pyx_t_8 = __Pyx_PyObject_CallOneArg(__pyx_builtin_hex, __pyx_cur_scope->__pyx_v_addr); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 92, __pyx_L1_error)
+    __pyx_t_8 = __Pyx_PyObject_CallOneArg(__pyx_builtin_hex, __pyx_cur_scope->__pyx_v_addr); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 88, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_8);
-    __pyx_t_9 = __Pyx_PyObject_FormatSimple(__pyx_t_8, __pyx_empty_unicode); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 92, __pyx_L1_error)
+    __pyx_t_9 = __Pyx_PyObject_FormatSimple(__pyx_t_8, __pyx_empty_unicode); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 88, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_9);
     __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
     __pyx_t_6 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_9) > __pyx_t_6) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_9) : __pyx_t_6;
@@ -4160,10 +4160,10 @@ static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___2gener
     __pyx_t_5 += 1;
     __Pyx_GIVEREF(__pyx_kp_u__2);
     PyTuple_SET_ITEM(__pyx_t_4, 3, __pyx_kp_u__2);
-    __pyx_t_9 = __Pyx_PyUnicode_Join(__pyx_t_4, 4, __pyx_t_5, __pyx_t_6); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 92, __pyx_L1_error)
+    __pyx_t_9 = __Pyx_PyUnicode_Join(__pyx_t_4, 4, __pyx_t_5, __pyx_t_6); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 88, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_9);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    if (unlikely(__Pyx_ListComp_Append(__pyx_r, (PyObject*)__pyx_t_9))) __PYX_ERR(0, 92, __pyx_L1_error)
+    if (unlikely(__Pyx_ListComp_Append(__pyx_r, (PyObject*)__pyx_t_9))) __PYX_ERR(0, 88, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -4191,7 +4191,7 @@ static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___2gener
 }
 static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___5generator1(__pyx_CoroutineObject *__pyx_generator, CYTHON_UNUSED PyThreadState *__pyx_tstate, PyObject *__pyx_sent_value); /* proto */
 
-/* "opendbc/can/parser_pyx.pyx":102
+/* "opendbc/can/parser_pyx.pyx":98
  *       signal_options_v.push_back(spo)
  * 
  *     message_options = dict((address, 0) for _, address in signals)             # <<<<<<<<<<<<<<
@@ -4211,7 +4211,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_8__init___3genex
   if (unlikely(!__pyx_cur_scope)) {
     __pyx_cur_scope = ((struct __pyx_obj_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr *)Py_None);
     __Pyx_INCREF(Py_None);
-    __PYX_ERR(0, 102, __pyx_L1_error)
+    __PYX_ERR(0, 98, __pyx_L1_error)
   } else {
     __Pyx_GOTREF((PyObject *)__pyx_cur_scope);
   }
@@ -4219,7 +4219,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_8__init___3genex
   __Pyx_INCREF(__pyx_cur_scope->__pyx_genexpr_arg_0);
   __Pyx_GIVEREF(__pyx_cur_scope->__pyx_genexpr_arg_0);
   {
-    __pyx_CoroutineObject *gen = __Pyx_Generator_New((__pyx_coroutine_body_t) __pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___5generator1, NULL, (PyObject *) __pyx_cur_scope, __pyx_n_s_genexpr, __pyx_n_s_init___locals_genexpr, __pyx_n_s_opendbc_can_parser_pyx); if (unlikely(!gen)) __PYX_ERR(0, 102, __pyx_L1_error)
+    __pyx_CoroutineObject *gen = __Pyx_Generator_New((__pyx_coroutine_body_t) __pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___5generator1, NULL, (PyObject *) __pyx_cur_scope, __pyx_n_s_genexpr, __pyx_n_s_init___locals_genexpr, __pyx_n_s_opendbc_can_parser_pyx); if (unlikely(!gen)) __PYX_ERR(0, 98, __pyx_L1_error)
     __Pyx_DECREF(__pyx_cur_scope);
     __Pyx_RefNannyFinishContext();
     return (PyObject *) gen;
@@ -4259,34 +4259,34 @@ static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___5gener
     return NULL;
   }
   __pyx_L3_first_run:;
-  if (unlikely(!__pyx_sent_value)) __PYX_ERR(0, 102, __pyx_L1_error)
-  __pyx_r = PyDict_New(); if (unlikely(!__pyx_r)) __PYX_ERR(0, 102, __pyx_L1_error)
+  if (unlikely(!__pyx_sent_value)) __PYX_ERR(0, 98, __pyx_L1_error)
+  __pyx_r = PyDict_New(); if (unlikely(!__pyx_r)) __PYX_ERR(0, 98, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_r);
-  if (unlikely(!__pyx_cur_scope->__pyx_genexpr_arg_0)) { __Pyx_RaiseUnboundLocalError(".0"); __PYX_ERR(0, 102, __pyx_L1_error) }
+  if (unlikely(!__pyx_cur_scope->__pyx_genexpr_arg_0)) { __Pyx_RaiseUnboundLocalError(".0"); __PYX_ERR(0, 98, __pyx_L1_error) }
   if (likely(PyList_CheckExact(__pyx_cur_scope->__pyx_genexpr_arg_0)) || PyTuple_CheckExact(__pyx_cur_scope->__pyx_genexpr_arg_0)) {
     __pyx_t_1 = __pyx_cur_scope->__pyx_genexpr_arg_0; __Pyx_INCREF(__pyx_t_1); __pyx_t_2 = 0;
     __pyx_t_3 = NULL;
   } else {
-    __pyx_t_2 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_cur_scope->__pyx_genexpr_arg_0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 102, __pyx_L1_error)
+    __pyx_t_2 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_cur_scope->__pyx_genexpr_arg_0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 98, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
-    __pyx_t_3 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 102, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 98, __pyx_L1_error)
   }
   for (;;) {
     if (likely(!__pyx_t_3)) {
       if (likely(PyList_CheckExact(__pyx_t_1))) {
         if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_1)) break;
         #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-        __pyx_t_4 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 102, __pyx_L1_error)
+        __pyx_t_4 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 98, __pyx_L1_error)
         #else
-        __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 102, __pyx_L1_error)
+        __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 98, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
         #endif
       } else {
         if (__pyx_t_2 >= PyTuple_GET_SIZE(__pyx_t_1)) break;
         #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-        __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 102, __pyx_L1_error)
+        __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 98, __pyx_L1_error)
         #else
-        __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 102, __pyx_L1_error)
+        __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 98, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
         #endif
       }
@@ -4296,7 +4296,7 @@ static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___5gener
         PyObject* exc_type = PyErr_Occurred();
         if (exc_type) {
           if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
-          else __PYX_ERR(0, 102, __pyx_L1_error)
+          else __PYX_ERR(0, 98, __pyx_L1_error)
         }
         break;
       }
@@ -4308,7 +4308,7 @@ static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___5gener
       if (unlikely(size != 2)) {
         if (size > 2) __Pyx_RaiseTooManyValuesError(2);
         else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);
-        __PYX_ERR(0, 102, __pyx_L1_error)
+        __PYX_ERR(0, 98, __pyx_L1_error)
       }
       #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
       if (likely(PyTuple_CheckExact(sequence))) {
@@ -4321,15 +4321,15 @@ static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___5gener
       __Pyx_INCREF(__pyx_t_5);
       __Pyx_INCREF(__pyx_t_6);
       #else
-      __pyx_t_5 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 102, __pyx_L1_error)
+      __pyx_t_5 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 98, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_5);
-      __pyx_t_6 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 102, __pyx_L1_error)
+      __pyx_t_6 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 98, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_6);
       #endif
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     } else {
       Py_ssize_t index = -1;
-      __pyx_t_7 = PyObject_GetIter(__pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 102, __pyx_L1_error)
+      __pyx_t_7 = PyObject_GetIter(__pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 98, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_7);
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       __pyx_t_8 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_7);
@@ -4337,7 +4337,7 @@ static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___5gener
       __Pyx_GOTREF(__pyx_t_5);
       index = 1; __pyx_t_6 = __pyx_t_8(__pyx_t_7); if (unlikely(!__pyx_t_6)) goto __pyx_L6_unpacking_failed;
       __Pyx_GOTREF(__pyx_t_6);
-      if (__Pyx_IternextUnpackEndCheck(__pyx_t_8(__pyx_t_7), 2) < 0) __PYX_ERR(0, 102, __pyx_L1_error)
+      if (__Pyx_IternextUnpackEndCheck(__pyx_t_8(__pyx_t_7), 2) < 0) __PYX_ERR(0, 98, __pyx_L1_error)
       __pyx_t_8 = NULL;
       __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
       goto __pyx_L7_unpacking_done;
@@ -4345,7 +4345,7 @@ static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___5gener
       __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
       __pyx_t_8 = NULL;
       if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);
-      __PYX_ERR(0, 102, __pyx_L1_error)
+      __PYX_ERR(0, 98, __pyx_L1_error)
       __pyx_L7_unpacking_done:;
     }
     __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v__);
@@ -4356,7 +4356,7 @@ static PyObject *__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___5gener
     __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_address, __pyx_t_6);
     __Pyx_GIVEREF(__pyx_t_6);
     __pyx_t_6 = 0;
-    if (unlikely(PyDict_SetItem(__pyx_r, (PyObject*)__pyx_cur_scope->__pyx_v_address, (PyObject*)__pyx_int_0))) __PYX_ERR(0, 102, __pyx_L1_error)
+    if (unlikely(PyDict_SetItem(__pyx_r, (PyObject*)__pyx_cur_scope->__pyx_v_address, (PyObject*)__pyx_int_0))) __PYX_ERR(0, 98, __pyx_L1_error)
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   CYTHON_MAYBE_UNUSED_VAR(__pyx_cur_scope);
@@ -4459,7 +4459,6 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
   __Pyx_INCREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
   __Pyx_GIVEREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
   __Pyx_INCREF(__pyx_v_checks);
-  __Pyx_INCREF(__pyx_v_enforce_checks);
 
   /* "opendbc/can/parser_pyx.pyx":32
  * 
@@ -4527,7 +4526,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
  *     if not self.dbc:
  *       raise RuntimeError(f"Can't find DBC: {dbc_name}")             # <<<<<<<<<<<<<<
  * 
- *     # rick - disable checks
+ *     self.vl = {}
  */
     __pyx_t_2 = __Pyx_PyObject_FormatSimple(__pyx_v_dbc_name, __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 38, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
@@ -4550,36 +4549,14 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
  */
   }
 
-  /* "opendbc/can/parser_pyx.pyx":41
- * 
- *     # rick - disable checks
- *     checks = []             # <<<<<<<<<<<<<<
- *     enforce_checks = False
- * 
- */
-  __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 41, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF_SET(__pyx_v_checks, __pyx_t_2);
-  __pyx_t_2 = 0;
-
-  /* "opendbc/can/parser_pyx.pyx":42
- *     # rick - disable checks
- *     checks = []
- *     enforce_checks = False             # <<<<<<<<<<<<<<
- * 
- *     self.vl = {}
- */
-  __Pyx_INCREF(Py_False);
-  __Pyx_DECREF_SET(__pyx_v_enforce_checks, Py_False);
-
-  /* "opendbc/can/parser_pyx.pyx":44
- *     enforce_checks = False
+  /* "opendbc/can/parser_pyx.pyx":40
+ *       raise RuntimeError(f"Can't find DBC: {dbc_name}")
  * 
  *     self.vl = {}             # <<<<<<<<<<<<<<
  *     self.vl_all = {}
  *     self.ts_nanos = {}
  */
-  __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 44, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 40, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_2);
   __Pyx_GOTREF(__pyx_cur_scope->__pyx_v_self->vl);
@@ -4587,14 +4564,14 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
   __pyx_cur_scope->__pyx_v_self->vl = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "opendbc/can/parser_pyx.pyx":45
+  /* "opendbc/can/parser_pyx.pyx":41
  * 
  *     self.vl = {}
  *     self.vl_all = {}             # <<<<<<<<<<<<<<
  *     self.ts_nanos = {}
  *     msg_name_to_address = {}
  */
-  __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 45, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 41, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_2);
   __Pyx_GOTREF(__pyx_cur_scope->__pyx_v_self->vl_all);
@@ -4602,14 +4579,14 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
   __pyx_cur_scope->__pyx_v_self->vl_all = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "opendbc/can/parser_pyx.pyx":46
+  /* "opendbc/can/parser_pyx.pyx":42
  *     self.vl = {}
  *     self.vl_all = {}
  *     self.ts_nanos = {}             # <<<<<<<<<<<<<<
  *     msg_name_to_address = {}
  *     msg_address_to_signals = {}
  */
-  __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 46, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 42, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_2);
   __Pyx_GOTREF(__pyx_cur_scope->__pyx_v_self->ts_nanos);
@@ -4617,31 +4594,31 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
   __pyx_cur_scope->__pyx_v_self->ts_nanos = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "opendbc/can/parser_pyx.pyx":47
+  /* "opendbc/can/parser_pyx.pyx":43
  *     self.vl_all = {}
  *     self.ts_nanos = {}
  *     msg_name_to_address = {}             # <<<<<<<<<<<<<<
  *     msg_address_to_signals = {}
  * 
  */
-  __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 47, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 43, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_v_msg_name_to_address = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "opendbc/can/parser_pyx.pyx":48
+  /* "opendbc/can/parser_pyx.pyx":44
  *     self.ts_nanos = {}
  *     msg_name_to_address = {}
  *     msg_address_to_signals = {}             # <<<<<<<<<<<<<<
  * 
  *     for i in range(self.dbc[0].msgs.size()):
  */
-  __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 48, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 44, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_v_msg_address_to_signals = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "opendbc/can/parser_pyx.pyx":50
+  /* "opendbc/can/parser_pyx.pyx":46
  *     msg_address_to_signals = {}
  * 
  *     for i in range(self.dbc[0].msgs.size()):             # <<<<<<<<<<<<<<
@@ -4653,7 +4630,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
   for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {
     __pyx_v_i = __pyx_t_7;
 
-    /* "opendbc/can/parser_pyx.pyx":51
+    /* "opendbc/can/parser_pyx.pyx":47
  * 
  *     for i in range(self.dbc[0].msgs.size()):
  *       msg = self.dbc[0].msgs[i]             # <<<<<<<<<<<<<<
@@ -4662,46 +4639,46 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
  */
     __pyx_v_msg = ((__pyx_cur_scope->__pyx_v_self->dbc[0]).msgs[__pyx_v_i]);
 
-    /* "opendbc/can/parser_pyx.pyx":52
+    /* "opendbc/can/parser_pyx.pyx":48
  *     for i in range(self.dbc[0].msgs.size()):
  *       msg = self.dbc[0].msgs[i]
  *       name = msg.name.decode("utf8")             # <<<<<<<<<<<<<<
  * 
  *       msg_name_to_address[name] = msg.address
  */
-    __pyx_t_2 = __Pyx_decode_cpp_string(__pyx_v_msg.name, 0, PY_SSIZE_T_MAX, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 52, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_decode_cpp_string(__pyx_v_msg.name, 0, PY_SSIZE_T_MAX, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 48, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_XDECREF_SET(__pyx_v_name, __pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":54
+    /* "opendbc/can/parser_pyx.pyx":50
  *       name = msg.name.decode("utf8")
  * 
  *       msg_name_to_address[name] = msg.address             # <<<<<<<<<<<<<<
  *       msg_address_to_signals[msg.address] = set()
  *       for sig in msg.sigs:
  */
-    __pyx_t_2 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 54, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 50, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    if (unlikely((PyDict_SetItem(__pyx_v_msg_name_to_address, __pyx_v_name, __pyx_t_2) < 0))) __PYX_ERR(0, 54, __pyx_L1_error)
+    if (unlikely((PyDict_SetItem(__pyx_v_msg_name_to_address, __pyx_v_name, __pyx_t_2) < 0))) __PYX_ERR(0, 50, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":55
+    /* "opendbc/can/parser_pyx.pyx":51
  * 
  *       msg_name_to_address[name] = msg.address
  *       msg_address_to_signals[msg.address] = set()             # <<<<<<<<<<<<<<
  *       for sig in msg.sigs:
  *         msg_address_to_signals[msg.address].add(sig.name.decode("utf8"))
  */
-    __pyx_t_2 = PySet_New(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 55, __pyx_L1_error)
+    __pyx_t_2 = PySet_New(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 51, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_4 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 55, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 51, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
-    if (unlikely((PyDict_SetItem(__pyx_v_msg_address_to_signals, __pyx_t_4, __pyx_t_2) < 0))) __PYX_ERR(0, 55, __pyx_L1_error)
+    if (unlikely((PyDict_SetItem(__pyx_v_msg_address_to_signals, __pyx_t_4, __pyx_t_2) < 0))) __PYX_ERR(0, 51, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":56
+    /* "opendbc/can/parser_pyx.pyx":52
  *       msg_name_to_address[name] = msg.address
  *       msg_address_to_signals[msg.address] = set()
  *       for sig in msg.sigs:             # <<<<<<<<<<<<<<
@@ -4715,22 +4692,22 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       ++__pyx_t_8;
       __pyx_v_sig = __pyx_t_9;
 
-      /* "opendbc/can/parser_pyx.pyx":57
+      /* "opendbc/can/parser_pyx.pyx":53
  *       msg_address_to_signals[msg.address] = set()
  *       for sig in msg.sigs:
  *         msg_address_to_signals[msg.address].add(sig.name.decode("utf8"))             # <<<<<<<<<<<<<<
  * 
  *       self.address_to_msg_name[msg.address] = name
  */
-      __pyx_t_4 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 57, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 53, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_10 = __Pyx_PyDict_GetItem(__pyx_v_msg_address_to_signals, __pyx_t_4); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 57, __pyx_L1_error)
+      __pyx_t_10 = __Pyx_PyDict_GetItem(__pyx_v_msg_address_to_signals, __pyx_t_4); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 53, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_10);
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_10, __pyx_n_s_add); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 57, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_10, __pyx_n_s_add); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 53, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
       __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-      __pyx_t_10 = __Pyx_decode_cpp_string(__pyx_v_sig.name, 0, PY_SSIZE_T_MAX, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 57, __pyx_L1_error)
+      __pyx_t_10 = __Pyx_decode_cpp_string(__pyx_v_sig.name, 0, PY_SSIZE_T_MAX, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 53, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_10);
       __pyx_t_11 = NULL;
       __pyx_t_12 = 0;
@@ -4749,13 +4726,13 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
         __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_12, 1+__pyx_t_12);
         __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;
         __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-        if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 57, __pyx_L1_error)
+        if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 53, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_2);
         __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       }
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-      /* "opendbc/can/parser_pyx.pyx":56
+      /* "opendbc/can/parser_pyx.pyx":52
  *       msg_name_to_address[name] = msg.address
  *       msg_address_to_signals[msg.address] = set()
  *       for sig in msg.sigs:             # <<<<<<<<<<<<<<
@@ -4764,36 +4741,36 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
  */
     }
 
-    /* "opendbc/can/parser_pyx.pyx":59
+    /* "opendbc/can/parser_pyx.pyx":55
  *         msg_address_to_signals[msg.address].add(sig.name.decode("utf8"))
  * 
  *       self.address_to_msg_name[msg.address] = name             # <<<<<<<<<<<<<<
  *       self.vl[msg.address] = {}
  *       self.vl[name] = self.vl[msg.address]
  */
-    __pyx_t_3 = __pyx_convert_string_from_py_std__in_string(__pyx_v_name); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 59, __pyx_L1_error)
+    __pyx_t_3 = __pyx_convert_string_from_py_std__in_string(__pyx_v_name); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 55, __pyx_L1_error)
     (__pyx_cur_scope->__pyx_v_self->address_to_msg_name[__pyx_v_msg.address]) = __pyx_t_3;
 
-    /* "opendbc/can/parser_pyx.pyx":60
+    /* "opendbc/can/parser_pyx.pyx":56
  * 
  *       self.address_to_msg_name[msg.address] = name
  *       self.vl[msg.address] = {}             # <<<<<<<<<<<<<<
  *       self.vl[name] = self.vl[msg.address]
  *       self.vl_all[msg.address] = {}
  */
-    __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 60, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 56, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     if (unlikely(__pyx_cur_scope->__pyx_v_self->vl == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-      __PYX_ERR(0, 60, __pyx_L1_error)
+      __PYX_ERR(0, 56, __pyx_L1_error)
     }
-    __pyx_t_4 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 60, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 56, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
-    if (unlikely((PyDict_SetItem(__pyx_cur_scope->__pyx_v_self->vl, __pyx_t_4, __pyx_t_2) < 0))) __PYX_ERR(0, 60, __pyx_L1_error)
+    if (unlikely((PyDict_SetItem(__pyx_cur_scope->__pyx_v_self->vl, __pyx_t_4, __pyx_t_2) < 0))) __PYX_ERR(0, 56, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":61
+    /* "opendbc/can/parser_pyx.pyx":57
  *       self.address_to_msg_name[msg.address] = name
  *       self.vl[msg.address] = {}
  *       self.vl[name] = self.vl[msg.address]             # <<<<<<<<<<<<<<
@@ -4802,40 +4779,40 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
  */
     if (unlikely(__pyx_cur_scope->__pyx_v_self->vl == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-      __PYX_ERR(0, 61, __pyx_L1_error)
+      __PYX_ERR(0, 57, __pyx_L1_error)
     }
-    __pyx_t_2 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 61, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 57, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_4 = __Pyx_PyDict_GetItem(__pyx_cur_scope->__pyx_v_self->vl, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 61, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyDict_GetItem(__pyx_cur_scope->__pyx_v_self->vl, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 57, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (unlikely(__pyx_cur_scope->__pyx_v_self->vl == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-      __PYX_ERR(0, 61, __pyx_L1_error)
+      __PYX_ERR(0, 57, __pyx_L1_error)
     }
-    if (unlikely((PyDict_SetItem(__pyx_cur_scope->__pyx_v_self->vl, __pyx_v_name, __pyx_t_4) < 0))) __PYX_ERR(0, 61, __pyx_L1_error)
+    if (unlikely((PyDict_SetItem(__pyx_cur_scope->__pyx_v_self->vl, __pyx_v_name, __pyx_t_4) < 0))) __PYX_ERR(0, 57, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":62
+    /* "opendbc/can/parser_pyx.pyx":58
  *       self.vl[msg.address] = {}
  *       self.vl[name] = self.vl[msg.address]
  *       self.vl_all[msg.address] = {}             # <<<<<<<<<<<<<<
  *       self.vl_all[name] = self.vl_all[msg.address]
  *       self.ts_nanos[msg.address] = {}
  */
-    __pyx_t_4 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 62, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 58, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     if (unlikely(__pyx_cur_scope->__pyx_v_self->vl_all == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-      __PYX_ERR(0, 62, __pyx_L1_error)
+      __PYX_ERR(0, 58, __pyx_L1_error)
     }
-    __pyx_t_2 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 62, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 58, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    if (unlikely((PyDict_SetItem(__pyx_cur_scope->__pyx_v_self->vl_all, __pyx_t_2, __pyx_t_4) < 0))) __PYX_ERR(0, 62, __pyx_L1_error)
+    if (unlikely((PyDict_SetItem(__pyx_cur_scope->__pyx_v_self->vl_all, __pyx_t_2, __pyx_t_4) < 0))) __PYX_ERR(0, 58, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":63
+    /* "opendbc/can/parser_pyx.pyx":59
  *       self.vl[name] = self.vl[msg.address]
  *       self.vl_all[msg.address] = {}
  *       self.vl_all[name] = self.vl_all[msg.address]             # <<<<<<<<<<<<<<
@@ -4844,40 +4821,40 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
  */
     if (unlikely(__pyx_cur_scope->__pyx_v_self->vl_all == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-      __PYX_ERR(0, 63, __pyx_L1_error)
+      __PYX_ERR(0, 59, __pyx_L1_error)
     }
-    __pyx_t_4 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 63, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 59, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
-    __pyx_t_2 = __Pyx_PyDict_GetItem(__pyx_cur_scope->__pyx_v_self->vl_all, __pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 63, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyDict_GetItem(__pyx_cur_scope->__pyx_v_self->vl_all, __pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 59, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     if (unlikely(__pyx_cur_scope->__pyx_v_self->vl_all == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-      __PYX_ERR(0, 63, __pyx_L1_error)
+      __PYX_ERR(0, 59, __pyx_L1_error)
     }
-    if (unlikely((PyDict_SetItem(__pyx_cur_scope->__pyx_v_self->vl_all, __pyx_v_name, __pyx_t_2) < 0))) __PYX_ERR(0, 63, __pyx_L1_error)
+    if (unlikely((PyDict_SetItem(__pyx_cur_scope->__pyx_v_self->vl_all, __pyx_v_name, __pyx_t_2) < 0))) __PYX_ERR(0, 59, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":64
+    /* "opendbc/can/parser_pyx.pyx":60
  *       self.vl_all[msg.address] = {}
  *       self.vl_all[name] = self.vl_all[msg.address]
  *       self.ts_nanos[msg.address] = {}             # <<<<<<<<<<<<<<
  *       self.ts_nanos[name] = self.ts_nanos[msg.address]
  * 
  */
-    __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 64, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 60, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     if (unlikely(__pyx_cur_scope->__pyx_v_self->ts_nanos == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-      __PYX_ERR(0, 64, __pyx_L1_error)
+      __PYX_ERR(0, 60, __pyx_L1_error)
     }
-    __pyx_t_4 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 64, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 60, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
-    if (unlikely((PyDict_SetItem(__pyx_cur_scope->__pyx_v_self->ts_nanos, __pyx_t_4, __pyx_t_2) < 0))) __PYX_ERR(0, 64, __pyx_L1_error)
+    if (unlikely((PyDict_SetItem(__pyx_cur_scope->__pyx_v_self->ts_nanos, __pyx_t_4, __pyx_t_2) < 0))) __PYX_ERR(0, 60, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":65
+    /* "opendbc/can/parser_pyx.pyx":61
  *       self.vl_all[name] = self.vl_all[msg.address]
  *       self.ts_nanos[msg.address] = {}
  *       self.ts_nanos[name] = self.ts_nanos[msg.address]             # <<<<<<<<<<<<<<
@@ -4886,71 +4863,71 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
  */
     if (unlikely(__pyx_cur_scope->__pyx_v_self->ts_nanos == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-      __PYX_ERR(0, 65, __pyx_L1_error)
+      __PYX_ERR(0, 61, __pyx_L1_error)
     }
-    __pyx_t_2 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 65, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyInt_From_uint32_t(__pyx_v_msg.address); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 61, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_4 = __Pyx_PyDict_GetItem(__pyx_cur_scope->__pyx_v_self->ts_nanos, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 65, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyDict_GetItem(__pyx_cur_scope->__pyx_v_self->ts_nanos, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 61, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (unlikely(__pyx_cur_scope->__pyx_v_self->ts_nanos == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-      __PYX_ERR(0, 65, __pyx_L1_error)
+      __PYX_ERR(0, 61, __pyx_L1_error)
     }
-    if (unlikely((PyDict_SetItem(__pyx_cur_scope->__pyx_v_self->ts_nanos, __pyx_v_name, __pyx_t_4) < 0))) __PYX_ERR(0, 65, __pyx_L1_error)
+    if (unlikely((PyDict_SetItem(__pyx_cur_scope->__pyx_v_self->ts_nanos, __pyx_v_name, __pyx_t_4) < 0))) __PYX_ERR(0, 61, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   }
 
-  /* "opendbc/can/parser_pyx.pyx":68
+  /* "opendbc/can/parser_pyx.pyx":64
  * 
  *     # Convert message names into addresses
  *     for i in range(len(signals)):             # <<<<<<<<<<<<<<
  *       s = signals[i]
  *       address = s[1] if isinstance(s[1], numbers.Number) else msg_name_to_address.get(s[1])
  */
-  __pyx_t_13 = PyObject_Length(__pyx_v_signals); if (unlikely(__pyx_t_13 == ((Py_ssize_t)-1))) __PYX_ERR(0, 68, __pyx_L1_error)
+  __pyx_t_13 = PyObject_Length(__pyx_v_signals); if (unlikely(__pyx_t_13 == ((Py_ssize_t)-1))) __PYX_ERR(0, 64, __pyx_L1_error)
   __pyx_t_14 = __pyx_t_13;
   for (__pyx_t_5 = 0; __pyx_t_5 < __pyx_t_14; __pyx_t_5+=1) {
     __pyx_v_i = __pyx_t_5;
 
-    /* "opendbc/can/parser_pyx.pyx":69
+    /* "opendbc/can/parser_pyx.pyx":65
  *     # Convert message names into addresses
  *     for i in range(len(signals)):
  *       s = signals[i]             # <<<<<<<<<<<<<<
  *       address = s[1] if isinstance(s[1], numbers.Number) else msg_name_to_address.get(s[1])
  *       if address not in msg_address_to_signals:
  */
-    __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_signals, __pyx_v_i, std::vector<struct Msg> ::size_type, 0, __Pyx_PyInt_FromSize_t, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 69, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_signals, __pyx_v_i, std::vector<struct Msg> ::size_type, 0, __Pyx_PyInt_FromSize_t, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 65, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_XDECREF_SET(__pyx_v_s, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":70
+    /* "opendbc/can/parser_pyx.pyx":66
  *     for i in range(len(signals)):
  *       s = signals[i]
  *       address = s[1] if isinstance(s[1], numbers.Number) else msg_name_to_address.get(s[1])             # <<<<<<<<<<<<<<
  *       if address not in msg_address_to_signals:
  *         raise RuntimeError(f"could not find message {repr(s[1])} in DBC {self.dbc_name}")
  */
-    __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_s, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 70, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_s, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 66, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_GetModuleGlobalName(__pyx_t_10, __pyx_n_s_numbers); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 70, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_10, __pyx_n_s_numbers); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 66, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_10);
-    __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_10, __pyx_n_s_Number); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 70, __pyx_L1_error)
+    __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_10, __pyx_n_s_Number); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 66, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_11);
     __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-    __pyx_t_1 = PyObject_IsInstance(__pyx_t_2, __pyx_t_11); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 70, __pyx_L1_error)
+    __pyx_t_1 = PyObject_IsInstance(__pyx_t_2, __pyx_t_11); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 66, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
     if (__pyx_t_1) {
-      __pyx_t_11 = __Pyx_GetItemInt(__pyx_v_s, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 70, __pyx_L1_error)
+      __pyx_t_11 = __Pyx_GetItemInt(__pyx_v_s, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 66, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_11);
       __pyx_t_4 = __pyx_t_11;
       __pyx_t_11 = 0;
     } else {
-      __pyx_t_11 = __Pyx_GetItemInt(__pyx_v_s, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 70, __pyx_L1_error)
+      __pyx_t_11 = __Pyx_GetItemInt(__pyx_v_s, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 66, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_11);
-      __pyx_t_2 = __Pyx_PyDict_GetItemDefault(__pyx_v_msg_name_to_address, __pyx_t_11, Py_None); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 70, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyDict_GetItemDefault(__pyx_v_msg_name_to_address, __pyx_t_11, Py_None); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 66, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
       __pyx_t_4 = __pyx_t_2;
@@ -4959,24 +4936,24 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
     __Pyx_XDECREF_SET(__pyx_v_address, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":71
+    /* "opendbc/can/parser_pyx.pyx":67
  *       s = signals[i]
  *       address = s[1] if isinstance(s[1], numbers.Number) else msg_name_to_address.get(s[1])
  *       if address not in msg_address_to_signals:             # <<<<<<<<<<<<<<
  *         raise RuntimeError(f"could not find message {repr(s[1])} in DBC {self.dbc_name}")
  *       if s[0] not in msg_address_to_signals[address]:
  */
-    __pyx_t_1 = (__Pyx_PyDict_ContainsTF(__pyx_v_address, __pyx_v_msg_address_to_signals, Py_NE)); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(0, 71, __pyx_L1_error)
+    __pyx_t_1 = (__Pyx_PyDict_ContainsTF(__pyx_v_address, __pyx_v_msg_address_to_signals, Py_NE)); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(0, 67, __pyx_L1_error)
     if (unlikely(__pyx_t_1)) {
 
-      /* "opendbc/can/parser_pyx.pyx":72
+      /* "opendbc/can/parser_pyx.pyx":68
  *       address = s[1] if isinstance(s[1], numbers.Number) else msg_name_to_address.get(s[1])
  *       if address not in msg_address_to_signals:
  *         raise RuntimeError(f"could not find message {repr(s[1])} in DBC {self.dbc_name}")             # <<<<<<<<<<<<<<
  *       if s[0] not in msg_address_to_signals[address]:
  *         raise RuntimeError(f"could not find signal {repr(s[0])} in {repr(s[1])}, DBC {self.dbc_name}")
  */
-      __pyx_t_4 = PyTuple_New(4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 72, __pyx_L1_error)
+      __pyx_t_4 = PyTuple_New(4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 68, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
       __pyx_t_15 = 0;
       __pyx_t_16 = 127;
@@ -4984,12 +4961,12 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       __pyx_t_15 += 23;
       __Pyx_GIVEREF(__pyx_kp_u_could_not_find_message);
       PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_kp_u_could_not_find_message);
-      __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_s, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 72, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_s, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 68, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_11 = PyObject_Repr(__pyx_t_2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 72, __pyx_L1_error)
+      __pyx_t_11 = PyObject_Repr(__pyx_t_2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 68, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_11);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      __pyx_t_2 = __Pyx_PyObject_FormatSimple(__pyx_t_11, __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 72, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyObject_FormatSimple(__pyx_t_11, __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 68, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
       __pyx_t_16 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) > __pyx_t_16) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) : __pyx_t_16;
@@ -5001,9 +4978,9 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       __pyx_t_15 += 8;
       __Pyx_GIVEREF(__pyx_kp_u_in_DBC);
       PyTuple_SET_ITEM(__pyx_t_4, 2, __pyx_kp_u_in_DBC);
-      __pyx_t_2 = __pyx_convert_PyBytes_string_to_py_std__in_string(__pyx_cur_scope->__pyx_v_self->dbc_name); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 72, __pyx_L1_error)
+      __pyx_t_2 = __pyx_convert_PyBytes_string_to_py_std__in_string(__pyx_cur_scope->__pyx_v_self->dbc_name); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 68, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_11 = __Pyx_PyObject_FormatSimple(__pyx_t_2, __pyx_empty_unicode); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 72, __pyx_L1_error)
+      __pyx_t_11 = __Pyx_PyObject_FormatSimple(__pyx_t_2, __pyx_empty_unicode); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 68, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_11);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __pyx_t_16 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_11) > __pyx_t_16) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_11) : __pyx_t_16;
@@ -5011,17 +4988,17 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       __Pyx_GIVEREF(__pyx_t_11);
       PyTuple_SET_ITEM(__pyx_t_4, 3, __pyx_t_11);
       __pyx_t_11 = 0;
-      __pyx_t_11 = __Pyx_PyUnicode_Join(__pyx_t_4, 4, __pyx_t_15, __pyx_t_16); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 72, __pyx_L1_error)
+      __pyx_t_11 = __Pyx_PyUnicode_Join(__pyx_t_4, 4, __pyx_t_15, __pyx_t_16); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 68, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_11);
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_builtin_RuntimeError, __pyx_t_11); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 72, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_builtin_RuntimeError, __pyx_t_11); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 68, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
       __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
       __Pyx_Raise(__pyx_t_4, 0, 0, 0);
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __PYX_ERR(0, 72, __pyx_L1_error)
+      __PYX_ERR(0, 68, __pyx_L1_error)
 
-      /* "opendbc/can/parser_pyx.pyx":71
+      /* "opendbc/can/parser_pyx.pyx":67
  *       s = signals[i]
  *       address = s[1] if isinstance(s[1], numbers.Number) else msg_name_to_address.get(s[1])
  *       if address not in msg_address_to_signals:             # <<<<<<<<<<<<<<
@@ -5030,30 +5007,30 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
  */
     }
 
-    /* "opendbc/can/parser_pyx.pyx":73
+    /* "opendbc/can/parser_pyx.pyx":69
  *       if address not in msg_address_to_signals:
  *         raise RuntimeError(f"could not find message {repr(s[1])} in DBC {self.dbc_name}")
  *       if s[0] not in msg_address_to_signals[address]:             # <<<<<<<<<<<<<<
  *         raise RuntimeError(f"could not find signal {repr(s[0])} in {repr(s[1])}, DBC {self.dbc_name}")
  * 
  */
-    __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_s, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 73, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_s, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 69, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
-    __pyx_t_11 = __Pyx_PyDict_GetItem(__pyx_v_msg_address_to_signals, __pyx_v_address); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 73, __pyx_L1_error)
+    __pyx_t_11 = __Pyx_PyDict_GetItem(__pyx_v_msg_address_to_signals, __pyx_v_address); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 69, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_11);
-    __pyx_t_1 = (__Pyx_PySequence_ContainsTF(__pyx_t_4, __pyx_t_11, Py_NE)); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(0, 73, __pyx_L1_error)
+    __pyx_t_1 = (__Pyx_PySequence_ContainsTF(__pyx_t_4, __pyx_t_11, Py_NE)); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(0, 69, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
     if (unlikely(__pyx_t_1)) {
 
-      /* "opendbc/can/parser_pyx.pyx":74
+      /* "opendbc/can/parser_pyx.pyx":70
  *         raise RuntimeError(f"could not find message {repr(s[1])} in DBC {self.dbc_name}")
  *       if s[0] not in msg_address_to_signals[address]:
  *         raise RuntimeError(f"could not find signal {repr(s[0])} in {repr(s[1])}, DBC {self.dbc_name}")             # <<<<<<<<<<<<<<
  * 
  *       signals[i] = (s[0], address)
  */
-      __pyx_t_11 = PyTuple_New(6); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 74, __pyx_L1_error)
+      __pyx_t_11 = PyTuple_New(6); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 70, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_11);
       __pyx_t_15 = 0;
       __pyx_t_16 = 127;
@@ -5061,12 +5038,12 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       __pyx_t_15 += 22;
       __Pyx_GIVEREF(__pyx_kp_u_could_not_find_signal);
       PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_kp_u_could_not_find_signal);
-      __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_s, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 74, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_s, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 70, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_2 = PyObject_Repr(__pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 74, __pyx_L1_error)
+      __pyx_t_2 = PyObject_Repr(__pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 70, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __pyx_t_4 = __Pyx_PyObject_FormatSimple(__pyx_t_2, __pyx_empty_unicode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 74, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_PyObject_FormatSimple(__pyx_t_2, __pyx_empty_unicode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 70, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __pyx_t_16 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_4) > __pyx_t_16) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_4) : __pyx_t_16;
@@ -5078,12 +5055,12 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       __pyx_t_15 += 4;
       __Pyx_GIVEREF(__pyx_kp_u_in);
       PyTuple_SET_ITEM(__pyx_t_11, 2, __pyx_kp_u_in);
-      __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_s, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 74, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_s, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 70, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_2 = PyObject_Repr(__pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 74, __pyx_L1_error)
+      __pyx_t_2 = PyObject_Repr(__pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 70, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __pyx_t_4 = __Pyx_PyObject_FormatSimple(__pyx_t_2, __pyx_empty_unicode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 74, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_PyObject_FormatSimple(__pyx_t_2, __pyx_empty_unicode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 70, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __pyx_t_16 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_4) > __pyx_t_16) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_4) : __pyx_t_16;
@@ -5095,9 +5072,9 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       __pyx_t_15 += 6;
       __Pyx_GIVEREF(__pyx_kp_u_DBC);
       PyTuple_SET_ITEM(__pyx_t_11, 4, __pyx_kp_u_DBC);
-      __pyx_t_4 = __pyx_convert_PyBytes_string_to_py_std__in_string(__pyx_cur_scope->__pyx_v_self->dbc_name); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 74, __pyx_L1_error)
+      __pyx_t_4 = __pyx_convert_PyBytes_string_to_py_std__in_string(__pyx_cur_scope->__pyx_v_self->dbc_name); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 70, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_2 = __Pyx_PyObject_FormatSimple(__pyx_t_4, __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 74, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyObject_FormatSimple(__pyx_t_4, __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 70, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       __pyx_t_16 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) > __pyx_t_16) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) : __pyx_t_16;
@@ -5105,17 +5082,17 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       __Pyx_GIVEREF(__pyx_t_2);
       PyTuple_SET_ITEM(__pyx_t_11, 5, __pyx_t_2);
       __pyx_t_2 = 0;
-      __pyx_t_2 = __Pyx_PyUnicode_Join(__pyx_t_11, 6, __pyx_t_15, __pyx_t_16); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 74, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyUnicode_Join(__pyx_t_11, 6, __pyx_t_15, __pyx_t_16); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 70, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-      __pyx_t_11 = __Pyx_PyObject_CallOneArg(__pyx_builtin_RuntimeError, __pyx_t_2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 74, __pyx_L1_error)
+      __pyx_t_11 = __Pyx_PyObject_CallOneArg(__pyx_builtin_RuntimeError, __pyx_t_2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 70, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_11);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __Pyx_Raise(__pyx_t_11, 0, 0, 0);
       __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-      __PYX_ERR(0, 74, __pyx_L1_error)
+      __PYX_ERR(0, 70, __pyx_L1_error)
 
-      /* "opendbc/can/parser_pyx.pyx":73
+      /* "opendbc/can/parser_pyx.pyx":69
  *       if address not in msg_address_to_signals:
  *         raise RuntimeError(f"could not find message {repr(s[1])} in DBC {self.dbc_name}")
  *       if s[0] not in msg_address_to_signals[address]:             # <<<<<<<<<<<<<<
@@ -5124,16 +5101,16 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
  */
     }
 
-    /* "opendbc/can/parser_pyx.pyx":76
+    /* "opendbc/can/parser_pyx.pyx":72
  *         raise RuntimeError(f"could not find signal {repr(s[0])} in {repr(s[1])}, DBC {self.dbc_name}")
  * 
  *       signals[i] = (s[0], address)             # <<<<<<<<<<<<<<
  * 
  *     for i in range(len(checks)):
  */
-    __pyx_t_11 = __Pyx_GetItemInt(__pyx_v_s, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 76, __pyx_L1_error)
+    __pyx_t_11 = __Pyx_GetItemInt(__pyx_v_s, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 72, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_11);
-    __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 76, __pyx_L1_error)
+    __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 72, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_GIVEREF(__pyx_t_11);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_11);
@@ -5141,86 +5118,86 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
     __Pyx_GIVEREF(__pyx_v_address);
     PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_address);
     __pyx_t_11 = 0;
-    if (unlikely((__Pyx_SetItemInt(__pyx_v_signals, __pyx_v_i, __pyx_t_2, std::vector<struct Msg> ::size_type, 0, __Pyx_PyInt_FromSize_t, 0, 0, 1) < 0))) __PYX_ERR(0, 76, __pyx_L1_error)
+    if (unlikely((__Pyx_SetItemInt(__pyx_v_signals, __pyx_v_i, __pyx_t_2, std::vector<struct Msg> ::size_type, 0, __Pyx_PyInt_FromSize_t, 0, 0, 1) < 0))) __PYX_ERR(0, 72, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
 
-  /* "opendbc/can/parser_pyx.pyx":78
+  /* "opendbc/can/parser_pyx.pyx":74
  *       signals[i] = (s[0], address)
  * 
  *     for i in range(len(checks)):             # <<<<<<<<<<<<<<
  *       c = checks[i]
  *       if not isinstance(c[0], numbers.Number):
  */
-  __pyx_t_13 = PyObject_Length(__pyx_v_checks); if (unlikely(__pyx_t_13 == ((Py_ssize_t)-1))) __PYX_ERR(0, 78, __pyx_L1_error)
+  __pyx_t_13 = PyObject_Length(__pyx_v_checks); if (unlikely(__pyx_t_13 == ((Py_ssize_t)-1))) __PYX_ERR(0, 74, __pyx_L1_error)
   __pyx_t_14 = __pyx_t_13;
   for (__pyx_t_5 = 0; __pyx_t_5 < __pyx_t_14; __pyx_t_5+=1) {
     __pyx_v_i = __pyx_t_5;
 
-    /* "opendbc/can/parser_pyx.pyx":79
+    /* "opendbc/can/parser_pyx.pyx":75
  * 
  *     for i in range(len(checks)):
  *       c = checks[i]             # <<<<<<<<<<<<<<
  *       if not isinstance(c[0], numbers.Number):
  *         if c[0] not in msg_name_to_address:
  */
-    __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_checks, __pyx_v_i, std::vector<struct Msg> ::size_type, 0, __Pyx_PyInt_FromSize_t, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 79, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_checks, __pyx_v_i, std::vector<struct Msg> ::size_type, 0, __Pyx_PyInt_FromSize_t, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 75, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_XDECREF_SET(__pyx_v_c, __pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":80
+    /* "opendbc/can/parser_pyx.pyx":76
  *     for i in range(len(checks)):
  *       c = checks[i]
  *       if not isinstance(c[0], numbers.Number):             # <<<<<<<<<<<<<<
  *         if c[0] not in msg_name_to_address:
  *           print(msg_name_to_address)
  */
-    __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_c, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 80, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_c, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 76, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_numbers); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 80, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_numbers); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 76, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_11);
-    __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_11, __pyx_n_s_Number); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 80, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_11, __pyx_n_s_Number); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 76, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-    __pyx_t_1 = PyObject_IsInstance(__pyx_t_2, __pyx_t_4); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 80, __pyx_L1_error)
+    __pyx_t_1 = PyObject_IsInstance(__pyx_t_2, __pyx_t_4); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 76, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_t_17 = (!__pyx_t_1);
     if (__pyx_t_17) {
 
-      /* "opendbc/can/parser_pyx.pyx":81
+      /* "opendbc/can/parser_pyx.pyx":77
  *       c = checks[i]
  *       if not isinstance(c[0], numbers.Number):
  *         if c[0] not in msg_name_to_address:             # <<<<<<<<<<<<<<
  *           print(msg_name_to_address)
  *           raise RuntimeError(f"could not find message {repr(c[0])} in DBC {self.dbc_name}")
  */
-      __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_c, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 81, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_c, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 77, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_17 = (__Pyx_PyDict_ContainsTF(__pyx_t_4, __pyx_v_msg_name_to_address, Py_NE)); if (unlikely((__pyx_t_17 < 0))) __PYX_ERR(0, 81, __pyx_L1_error)
+      __pyx_t_17 = (__Pyx_PyDict_ContainsTF(__pyx_t_4, __pyx_v_msg_name_to_address, Py_NE)); if (unlikely((__pyx_t_17 < 0))) __PYX_ERR(0, 77, __pyx_L1_error)
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       if (unlikely(__pyx_t_17)) {
 
-        /* "opendbc/can/parser_pyx.pyx":82
+        /* "opendbc/can/parser_pyx.pyx":78
  *       if not isinstance(c[0], numbers.Number):
  *         if c[0] not in msg_name_to_address:
  *           print(msg_name_to_address)             # <<<<<<<<<<<<<<
  *           raise RuntimeError(f"could not find message {repr(c[0])} in DBC {self.dbc_name}")
  *         c = (msg_name_to_address[c[0]], c[1])
  */
-        __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_builtin_print, __pyx_v_msg_name_to_address); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 82, __pyx_L1_error)
+        __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_builtin_print, __pyx_v_msg_name_to_address); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 78, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
         __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-        /* "opendbc/can/parser_pyx.pyx":83
+        /* "opendbc/can/parser_pyx.pyx":79
  *         if c[0] not in msg_name_to_address:
  *           print(msg_name_to_address)
  *           raise RuntimeError(f"could not find message {repr(c[0])} in DBC {self.dbc_name}")             # <<<<<<<<<<<<<<
  *         c = (msg_name_to_address[c[0]], c[1])
  *         checks[i] = c
  */
-        __pyx_t_4 = PyTuple_New(4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 83, __pyx_L1_error)
+        __pyx_t_4 = PyTuple_New(4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 79, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
         __pyx_t_15 = 0;
         __pyx_t_16 = 127;
@@ -5228,12 +5205,12 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
         __pyx_t_15 += 23;
         __Pyx_GIVEREF(__pyx_kp_u_could_not_find_message);
         PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_kp_u_could_not_find_message);
-        __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_c, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 83, __pyx_L1_error)
+        __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_c, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 79, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_2);
-        __pyx_t_11 = PyObject_Repr(__pyx_t_2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 83, __pyx_L1_error)
+        __pyx_t_11 = PyObject_Repr(__pyx_t_2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 79, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_11);
         __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-        __pyx_t_2 = __Pyx_PyObject_FormatSimple(__pyx_t_11, __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 83, __pyx_L1_error)
+        __pyx_t_2 = __Pyx_PyObject_FormatSimple(__pyx_t_11, __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 79, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_2);
         __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
         __pyx_t_16 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) > __pyx_t_16) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) : __pyx_t_16;
@@ -5245,9 +5222,9 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
         __pyx_t_15 += 8;
         __Pyx_GIVEREF(__pyx_kp_u_in_DBC);
         PyTuple_SET_ITEM(__pyx_t_4, 2, __pyx_kp_u_in_DBC);
-        __pyx_t_2 = __pyx_convert_PyBytes_string_to_py_std__in_string(__pyx_cur_scope->__pyx_v_self->dbc_name); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 83, __pyx_L1_error)
+        __pyx_t_2 = __pyx_convert_PyBytes_string_to_py_std__in_string(__pyx_cur_scope->__pyx_v_self->dbc_name); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 79, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_2);
-        __pyx_t_11 = __Pyx_PyObject_FormatSimple(__pyx_t_2, __pyx_empty_unicode); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 83, __pyx_L1_error)
+        __pyx_t_11 = __Pyx_PyObject_FormatSimple(__pyx_t_2, __pyx_empty_unicode); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 79, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_11);
         __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
         __pyx_t_16 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_11) > __pyx_t_16) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_11) : __pyx_t_16;
@@ -5255,17 +5232,17 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
         __Pyx_GIVEREF(__pyx_t_11);
         PyTuple_SET_ITEM(__pyx_t_4, 3, __pyx_t_11);
         __pyx_t_11 = 0;
-        __pyx_t_11 = __Pyx_PyUnicode_Join(__pyx_t_4, 4, __pyx_t_15, __pyx_t_16); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 83, __pyx_L1_error)
+        __pyx_t_11 = __Pyx_PyUnicode_Join(__pyx_t_4, 4, __pyx_t_15, __pyx_t_16); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 79, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_11);
         __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-        __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_builtin_RuntimeError, __pyx_t_11); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 83, __pyx_L1_error)
+        __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_builtin_RuntimeError, __pyx_t_11); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 79, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
         __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
         __Pyx_Raise(__pyx_t_4, 0, 0, 0);
         __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-        __PYX_ERR(0, 83, __pyx_L1_error)
+        __PYX_ERR(0, 79, __pyx_L1_error)
 
-        /* "opendbc/can/parser_pyx.pyx":81
+        /* "opendbc/can/parser_pyx.pyx":77
  *       c = checks[i]
  *       if not isinstance(c[0], numbers.Number):
  *         if c[0] not in msg_name_to_address:             # <<<<<<<<<<<<<<
@@ -5274,21 +5251,21 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
  */
       }
 
-      /* "opendbc/can/parser_pyx.pyx":84
+      /* "opendbc/can/parser_pyx.pyx":80
  *           print(msg_name_to_address)
  *           raise RuntimeError(f"could not find message {repr(c[0])} in DBC {self.dbc_name}")
  *         c = (msg_name_to_address[c[0]], c[1])             # <<<<<<<<<<<<<<
  *         checks[i] = c
  * 
  */
-      __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_c, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 84, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_c, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 80, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_11 = __Pyx_PyDict_GetItem(__pyx_v_msg_name_to_address, __pyx_t_4); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 84, __pyx_L1_error)
+      __pyx_t_11 = __Pyx_PyDict_GetItem(__pyx_v_msg_name_to_address, __pyx_t_4); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 80, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_11);
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_c, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 84, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_c, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 80, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 84, __pyx_L1_error)
+      __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 80, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_GIVEREF(__pyx_t_11);
       PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_11);
@@ -5299,16 +5276,16 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       __Pyx_DECREF_SET(__pyx_v_c, __pyx_t_2);
       __pyx_t_2 = 0;
 
-      /* "opendbc/can/parser_pyx.pyx":85
+      /* "opendbc/can/parser_pyx.pyx":81
  *           raise RuntimeError(f"could not find message {repr(c[0])} in DBC {self.dbc_name}")
  *         c = (msg_name_to_address[c[0]], c[1])
  *         checks[i] = c             # <<<<<<<<<<<<<<
  * 
  *     if enforce_checks:
  */
-      if (unlikely((__Pyx_SetItemInt(__pyx_v_checks, __pyx_v_i, __pyx_v_c, std::vector<struct Msg> ::size_type, 0, __Pyx_PyInt_FromSize_t, 0, 0, 1) < 0))) __PYX_ERR(0, 85, __pyx_L1_error)
+      if (unlikely((__Pyx_SetItemInt(__pyx_v_checks, __pyx_v_i, __pyx_v_c, std::vector<struct Msg> ::size_type, 0, __Pyx_PyInt_FromSize_t, 0, 0, 1) < 0))) __PYX_ERR(0, 81, __pyx_L1_error)
 
-      /* "opendbc/can/parser_pyx.pyx":80
+      /* "opendbc/can/parser_pyx.pyx":76
  *     for i in range(len(checks)):
  *       c = checks[i]
  *       if not isinstance(c[0], numbers.Number):             # <<<<<<<<<<<<<<
@@ -5318,17 +5295,17 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
     }
   }
 
-  /* "opendbc/can/parser_pyx.pyx":87
+  /* "opendbc/can/parser_pyx.pyx":83
  *         checks[i] = c
  * 
  *     if enforce_checks:             # <<<<<<<<<<<<<<
  *       checked_addrs = {c[0] for c in checks}
  *       signal_addrs = {s[1] for s in signals}
  */
-  __pyx_t_17 = __Pyx_PyObject_IsTrue(__pyx_v_enforce_checks); if (unlikely((__pyx_t_17 < 0))) __PYX_ERR(0, 87, __pyx_L1_error)
+  __pyx_t_17 = __Pyx_PyObject_IsTrue(__pyx_v_enforce_checks); if (unlikely((__pyx_t_17 < 0))) __PYX_ERR(0, 83, __pyx_L1_error)
   if (__pyx_t_17) {
 
-    /* "opendbc/can/parser_pyx.pyx":88
+    /* "opendbc/can/parser_pyx.pyx":84
  * 
  *     if enforce_checks:
  *       checked_addrs = {c[0] for c in checks}             # <<<<<<<<<<<<<<
@@ -5336,32 +5313,32 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
  *       unchecked = signal_addrs - checked_addrs
  */
     { /* enter inner scope */
-      __pyx_t_2 = PySet_New(NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 88, __pyx_L21_error)
+      __pyx_t_2 = PySet_New(NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 84, __pyx_L21_error)
       __Pyx_GOTREF(__pyx_t_2);
       if (likely(PyList_CheckExact(__pyx_v_checks)) || PyTuple_CheckExact(__pyx_v_checks)) {
         __pyx_t_4 = __pyx_v_checks; __Pyx_INCREF(__pyx_t_4); __pyx_t_13 = 0;
         __pyx_t_18 = NULL;
       } else {
-        __pyx_t_13 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_v_checks); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 88, __pyx_L21_error)
+        __pyx_t_13 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_v_checks); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 84, __pyx_L21_error)
         __Pyx_GOTREF(__pyx_t_4);
-        __pyx_t_18 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_4); if (unlikely(!__pyx_t_18)) __PYX_ERR(0, 88, __pyx_L21_error)
+        __pyx_t_18 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_4); if (unlikely(!__pyx_t_18)) __PYX_ERR(0, 84, __pyx_L21_error)
       }
       for (;;) {
         if (likely(!__pyx_t_18)) {
           if (likely(PyList_CheckExact(__pyx_t_4))) {
             if (__pyx_t_13 >= PyList_GET_SIZE(__pyx_t_4)) break;
             #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-            __pyx_t_11 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_13); __Pyx_INCREF(__pyx_t_11); __pyx_t_13++; if (unlikely((0 < 0))) __PYX_ERR(0, 88, __pyx_L21_error)
+            __pyx_t_11 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_13); __Pyx_INCREF(__pyx_t_11); __pyx_t_13++; if (unlikely((0 < 0))) __PYX_ERR(0, 84, __pyx_L21_error)
             #else
-            __pyx_t_11 = PySequence_ITEM(__pyx_t_4, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 88, __pyx_L21_error)
+            __pyx_t_11 = PySequence_ITEM(__pyx_t_4, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 84, __pyx_L21_error)
             __Pyx_GOTREF(__pyx_t_11);
             #endif
           } else {
             if (__pyx_t_13 >= PyTuple_GET_SIZE(__pyx_t_4)) break;
             #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-            __pyx_t_11 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_13); __Pyx_INCREF(__pyx_t_11); __pyx_t_13++; if (unlikely((0 < 0))) __PYX_ERR(0, 88, __pyx_L21_error)
+            __pyx_t_11 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_13); __Pyx_INCREF(__pyx_t_11); __pyx_t_13++; if (unlikely((0 < 0))) __PYX_ERR(0, 84, __pyx_L21_error)
             #else
-            __pyx_t_11 = PySequence_ITEM(__pyx_t_4, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 88, __pyx_L21_error)
+            __pyx_t_11 = PySequence_ITEM(__pyx_t_4, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 84, __pyx_L21_error)
             __Pyx_GOTREF(__pyx_t_11);
             #endif
           }
@@ -5371,7 +5348,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
             PyObject* exc_type = PyErr_Occurred();
             if (exc_type) {
               if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
-              else __PYX_ERR(0, 88, __pyx_L21_error)
+              else __PYX_ERR(0, 84, __pyx_L21_error)
             }
             break;
           }
@@ -5379,9 +5356,9 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
         }
         __Pyx_XDECREF_SET(__pyx_7genexpr__pyx_v_c, __pyx_t_11);
         __pyx_t_11 = 0;
-        __pyx_t_11 = __Pyx_GetItemInt(__pyx_7genexpr__pyx_v_c, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 88, __pyx_L21_error)
+        __pyx_t_11 = __Pyx_GetItemInt(__pyx_7genexpr__pyx_v_c, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 84, __pyx_L21_error)
         __Pyx_GOTREF(__pyx_t_11);
-        if (unlikely(PySet_Add(__pyx_t_2, (PyObject*)__pyx_t_11))) __PYX_ERR(0, 88, __pyx_L21_error)
+        if (unlikely(PySet_Add(__pyx_t_2, (PyObject*)__pyx_t_11))) __PYX_ERR(0, 84, __pyx_L21_error)
         __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
       }
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
@@ -5395,7 +5372,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
     __pyx_v_checked_addrs = ((PyObject*)__pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":89
+    /* "opendbc/can/parser_pyx.pyx":85
  *     if enforce_checks:
  *       checked_addrs = {c[0] for c in checks}
  *       signal_addrs = {s[1] for s in signals}             # <<<<<<<<<<<<<<
@@ -5403,32 +5380,32 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
  *       if len(unchecked):
  */
     { /* enter inner scope */
-      __pyx_t_2 = PySet_New(NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 89, __pyx_L28_error)
+      __pyx_t_2 = PySet_New(NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 85, __pyx_L28_error)
       __Pyx_GOTREF(__pyx_t_2);
       if (likely(PyList_CheckExact(__pyx_v_signals)) || PyTuple_CheckExact(__pyx_v_signals)) {
         __pyx_t_4 = __pyx_v_signals; __Pyx_INCREF(__pyx_t_4); __pyx_t_13 = 0;
         __pyx_t_18 = NULL;
       } else {
-        __pyx_t_13 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_v_signals); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 89, __pyx_L28_error)
+        __pyx_t_13 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_v_signals); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 85, __pyx_L28_error)
         __Pyx_GOTREF(__pyx_t_4);
-        __pyx_t_18 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_4); if (unlikely(!__pyx_t_18)) __PYX_ERR(0, 89, __pyx_L28_error)
+        __pyx_t_18 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_4); if (unlikely(!__pyx_t_18)) __PYX_ERR(0, 85, __pyx_L28_error)
       }
       for (;;) {
         if (likely(!__pyx_t_18)) {
           if (likely(PyList_CheckExact(__pyx_t_4))) {
             if (__pyx_t_13 >= PyList_GET_SIZE(__pyx_t_4)) break;
             #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-            __pyx_t_11 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_13); __Pyx_INCREF(__pyx_t_11); __pyx_t_13++; if (unlikely((0 < 0))) __PYX_ERR(0, 89, __pyx_L28_error)
+            __pyx_t_11 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_13); __Pyx_INCREF(__pyx_t_11); __pyx_t_13++; if (unlikely((0 < 0))) __PYX_ERR(0, 85, __pyx_L28_error)
             #else
-            __pyx_t_11 = PySequence_ITEM(__pyx_t_4, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 89, __pyx_L28_error)
+            __pyx_t_11 = PySequence_ITEM(__pyx_t_4, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 85, __pyx_L28_error)
             __Pyx_GOTREF(__pyx_t_11);
             #endif
           } else {
             if (__pyx_t_13 >= PyTuple_GET_SIZE(__pyx_t_4)) break;
             #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-            __pyx_t_11 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_13); __Pyx_INCREF(__pyx_t_11); __pyx_t_13++; if (unlikely((0 < 0))) __PYX_ERR(0, 89, __pyx_L28_error)
+            __pyx_t_11 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_13); __Pyx_INCREF(__pyx_t_11); __pyx_t_13++; if (unlikely((0 < 0))) __PYX_ERR(0, 85, __pyx_L28_error)
             #else
-            __pyx_t_11 = PySequence_ITEM(__pyx_t_4, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 89, __pyx_L28_error)
+            __pyx_t_11 = PySequence_ITEM(__pyx_t_4, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 85, __pyx_L28_error)
             __Pyx_GOTREF(__pyx_t_11);
             #endif
           }
@@ -5438,7 +5415,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
             PyObject* exc_type = PyErr_Occurred();
             if (exc_type) {
               if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
-              else __PYX_ERR(0, 89, __pyx_L28_error)
+              else __PYX_ERR(0, 85, __pyx_L28_error)
             }
             break;
           }
@@ -5446,9 +5423,9 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
         }
         __Pyx_XDECREF_SET(__pyx_8genexpr1__pyx_v_s, __pyx_t_11);
         __pyx_t_11 = 0;
-        __pyx_t_11 = __Pyx_GetItemInt(__pyx_8genexpr1__pyx_v_s, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 89, __pyx_L28_error)
+        __pyx_t_11 = __Pyx_GetItemInt(__pyx_8genexpr1__pyx_v_s, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 85, __pyx_L28_error)
         __Pyx_GOTREF(__pyx_t_11);
-        if (unlikely(PySet_Add(__pyx_t_2, (PyObject*)__pyx_t_11))) __PYX_ERR(0, 89, __pyx_L28_error)
+        if (unlikely(PySet_Add(__pyx_t_2, (PyObject*)__pyx_t_11))) __PYX_ERR(0, 85, __pyx_L28_error)
         __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
       }
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
@@ -5462,67 +5439,67 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
     __pyx_v_signal_addrs = ((PyObject*)__pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":90
+    /* "opendbc/can/parser_pyx.pyx":86
  *       checked_addrs = {c[0] for c in checks}
  *       signal_addrs = {s[1] for s in signals}
  *       unchecked = signal_addrs - checked_addrs             # <<<<<<<<<<<<<<
  *       if len(unchecked):
  *         err_msg = ", ".join(f"{self.address_to_msg_name[addr].decode()} ({hex(addr)})" for addr in unchecked)
  */
-    __pyx_t_2 = PyNumber_Subtract(__pyx_v_signal_addrs, __pyx_v_checked_addrs); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 90, __pyx_L1_error)
+    __pyx_t_2 = PyNumber_Subtract(__pyx_v_signal_addrs, __pyx_v_checked_addrs); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 86, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __pyx_v_unchecked = __pyx_t_2;
     __pyx_t_2 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":91
+    /* "opendbc/can/parser_pyx.pyx":87
  *       signal_addrs = {s[1] for s in signals}
  *       unchecked = signal_addrs - checked_addrs
  *       if len(unchecked):             # <<<<<<<<<<<<<<
  *         err_msg = ", ".join(f"{self.address_to_msg_name[addr].decode()} ({hex(addr)})" for addr in unchecked)
  *         raise RuntimeError(f"Unchecked addrs: {err_msg}")
  */
-    __pyx_t_13 = PyObject_Length(__pyx_v_unchecked); if (unlikely(__pyx_t_13 == ((Py_ssize_t)-1))) __PYX_ERR(0, 91, __pyx_L1_error)
+    __pyx_t_13 = PyObject_Length(__pyx_v_unchecked); if (unlikely(__pyx_t_13 == ((Py_ssize_t)-1))) __PYX_ERR(0, 87, __pyx_L1_error)
     __pyx_t_17 = (__pyx_t_13 != 0);
     if (unlikely(__pyx_t_17)) {
 
-      /* "opendbc/can/parser_pyx.pyx":92
+      /* "opendbc/can/parser_pyx.pyx":88
  *       unchecked = signal_addrs - checked_addrs
  *       if len(unchecked):
  *         err_msg = ", ".join(f"{self.address_to_msg_name[addr].decode()} ({hex(addr)})" for addr in unchecked)             # <<<<<<<<<<<<<<
  *         raise RuntimeError(f"Unchecked addrs: {err_msg}")
  * 
  */
-      __pyx_t_2 = __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_8__init___genexpr(((PyObject*)__pyx_cur_scope), __pyx_v_unchecked); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 92, __pyx_L1_error)
+      __pyx_t_2 = __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_8__init___genexpr(((PyObject*)__pyx_cur_scope), __pyx_v_unchecked); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 88, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_4 = __Pyx_Generator_Next(__pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 92, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_Generator_Next(__pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 88, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      __pyx_t_2 = PyUnicode_Join(__pyx_kp_u__3, __pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 92, __pyx_L1_error)
+      __pyx_t_2 = PyUnicode_Join(__pyx_kp_u__3, __pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 88, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       __pyx_v_err_msg = ((PyObject*)__pyx_t_2);
       __pyx_t_2 = 0;
 
-      /* "opendbc/can/parser_pyx.pyx":93
+      /* "opendbc/can/parser_pyx.pyx":89
  *       if len(unchecked):
  *         err_msg = ", ".join(f"{self.address_to_msg_name[addr].decode()} ({hex(addr)})" for addr in unchecked)
  *         raise RuntimeError(f"Unchecked addrs: {err_msg}")             # <<<<<<<<<<<<<<
  * 
  *     cdef vector[SignalParseOptions] signal_options_v
  */
-      __pyx_t_2 = __Pyx_PyUnicode_Unicode(__pyx_v_err_msg); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 93, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyUnicode_Unicode(__pyx_v_err_msg); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 89, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_4 = __Pyx_PyUnicode_Concat(__pyx_kp_u_Unchecked_addrs, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 93, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_PyUnicode_Concat(__pyx_kp_u_Unchecked_addrs, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 89, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_builtin_RuntimeError, __pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 93, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_builtin_RuntimeError, __pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 89, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       __Pyx_Raise(__pyx_t_2, 0, 0, 0);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      __PYX_ERR(0, 93, __pyx_L1_error)
+      __PYX_ERR(0, 89, __pyx_L1_error)
 
-      /* "opendbc/can/parser_pyx.pyx":91
+      /* "opendbc/can/parser_pyx.pyx":87
  *       signal_addrs = {s[1] for s in signals}
  *       unchecked = signal_addrs - checked_addrs
  *       if len(unchecked):             # <<<<<<<<<<<<<<
@@ -5531,7 +5508,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
  */
     }
 
-    /* "opendbc/can/parser_pyx.pyx":87
+    /* "opendbc/can/parser_pyx.pyx":83
  *         checks[i] = c
  * 
  *     if enforce_checks:             # <<<<<<<<<<<<<<
@@ -5540,7 +5517,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
  */
   }
 
-  /* "opendbc/can/parser_pyx.pyx":97
+  /* "opendbc/can/parser_pyx.pyx":93
  *     cdef vector[SignalParseOptions] signal_options_v
  *     cdef SignalParseOptions spo
  *     for sig_name, sig_address in signals:             # <<<<<<<<<<<<<<
@@ -5551,26 +5528,26 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
     __pyx_t_2 = __pyx_v_signals; __Pyx_INCREF(__pyx_t_2); __pyx_t_13 = 0;
     __pyx_t_18 = NULL;
   } else {
-    __pyx_t_13 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_v_signals); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 97, __pyx_L1_error)
+    __pyx_t_13 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_v_signals); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 93, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_18 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_2); if (unlikely(!__pyx_t_18)) __PYX_ERR(0, 97, __pyx_L1_error)
+    __pyx_t_18 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_2); if (unlikely(!__pyx_t_18)) __PYX_ERR(0, 93, __pyx_L1_error)
   }
   for (;;) {
     if (likely(!__pyx_t_18)) {
       if (likely(PyList_CheckExact(__pyx_t_2))) {
         if (__pyx_t_13 >= PyList_GET_SIZE(__pyx_t_2)) break;
         #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-        __pyx_t_4 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_13); __Pyx_INCREF(__pyx_t_4); __pyx_t_13++; if (unlikely((0 < 0))) __PYX_ERR(0, 97, __pyx_L1_error)
+        __pyx_t_4 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_13); __Pyx_INCREF(__pyx_t_4); __pyx_t_13++; if (unlikely((0 < 0))) __PYX_ERR(0, 93, __pyx_L1_error)
         #else
-        __pyx_t_4 = PySequence_ITEM(__pyx_t_2, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 97, __pyx_L1_error)
+        __pyx_t_4 = PySequence_ITEM(__pyx_t_2, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 93, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
         #endif
       } else {
         if (__pyx_t_13 >= PyTuple_GET_SIZE(__pyx_t_2)) break;
         #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-        __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_13); __Pyx_INCREF(__pyx_t_4); __pyx_t_13++; if (unlikely((0 < 0))) __PYX_ERR(0, 97, __pyx_L1_error)
+        __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_13); __Pyx_INCREF(__pyx_t_4); __pyx_t_13++; if (unlikely((0 < 0))) __PYX_ERR(0, 93, __pyx_L1_error)
         #else
-        __pyx_t_4 = PySequence_ITEM(__pyx_t_2, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 97, __pyx_L1_error)
+        __pyx_t_4 = PySequence_ITEM(__pyx_t_2, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 93, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
         #endif
       }
@@ -5580,7 +5557,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
         PyObject* exc_type = PyErr_Occurred();
         if (exc_type) {
           if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
-          else __PYX_ERR(0, 97, __pyx_L1_error)
+          else __PYX_ERR(0, 93, __pyx_L1_error)
         }
         break;
       }
@@ -5592,7 +5569,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       if (unlikely(size != 2)) {
         if (size > 2) __Pyx_RaiseTooManyValuesError(2);
         else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);
-        __PYX_ERR(0, 97, __pyx_L1_error)
+        __PYX_ERR(0, 93, __pyx_L1_error)
       }
       #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
       if (likely(PyTuple_CheckExact(sequence))) {
@@ -5605,15 +5582,15 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       __Pyx_INCREF(__pyx_t_11);
       __Pyx_INCREF(__pyx_t_10);
       #else
-      __pyx_t_11 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 97, __pyx_L1_error)
+      __pyx_t_11 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 93, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_11);
-      __pyx_t_10 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 97, __pyx_L1_error)
+      __pyx_t_10 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 93, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_10);
       #endif
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     } else {
       Py_ssize_t index = -1;
-      __pyx_t_19 = PyObject_GetIter(__pyx_t_4); if (unlikely(!__pyx_t_19)) __PYX_ERR(0, 97, __pyx_L1_error)
+      __pyx_t_19 = PyObject_GetIter(__pyx_t_4); if (unlikely(!__pyx_t_19)) __PYX_ERR(0, 93, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_19);
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       __pyx_t_20 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_19);
@@ -5621,7 +5598,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       __Pyx_GOTREF(__pyx_t_11);
       index = 1; __pyx_t_10 = __pyx_t_20(__pyx_t_19); if (unlikely(!__pyx_t_10)) goto __pyx_L36_unpacking_failed;
       __Pyx_GOTREF(__pyx_t_10);
-      if (__Pyx_IternextUnpackEndCheck(__pyx_t_20(__pyx_t_19), 2) < 0) __PYX_ERR(0, 97, __pyx_L1_error)
+      if (__Pyx_IternextUnpackEndCheck(__pyx_t_20(__pyx_t_19), 2) < 0) __PYX_ERR(0, 93, __pyx_L1_error)
       __pyx_t_20 = NULL;
       __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0;
       goto __pyx_L37_unpacking_done;
@@ -5629,7 +5606,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0;
       __pyx_t_20 = NULL;
       if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);
-      __PYX_ERR(0, 97, __pyx_L1_error)
+      __PYX_ERR(0, 93, __pyx_L1_error)
       __pyx_L37_unpacking_done:;
     }
     __Pyx_XDECREF_SET(__pyx_v_sig_name, __pyx_t_11);
@@ -5637,27 +5614,27 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
     __Pyx_XDECREF_SET(__pyx_v_sig_address, __pyx_t_10);
     __pyx_t_10 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":98
+    /* "opendbc/can/parser_pyx.pyx":94
  *     cdef SignalParseOptions spo
  *     for sig_name, sig_address in signals:
  *       spo.address = sig_address             # <<<<<<<<<<<<<<
  *       spo.name = sig_name
  *       signal_options_v.push_back(spo)
  */
-    __pyx_t_21 = __Pyx_PyInt_As_uint32_t(__pyx_v_sig_address); if (unlikely((__pyx_t_21 == ((uint32_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 98, __pyx_L1_error)
+    __pyx_t_21 = __Pyx_PyInt_As_uint32_t(__pyx_v_sig_address); if (unlikely((__pyx_t_21 == ((uint32_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 94, __pyx_L1_error)
     __pyx_v_spo.address = __pyx_t_21;
 
-    /* "opendbc/can/parser_pyx.pyx":99
+    /* "opendbc/can/parser_pyx.pyx":95
  *     for sig_name, sig_address in signals:
  *       spo.address = sig_address
  *       spo.name = sig_name             # <<<<<<<<<<<<<<
  *       signal_options_v.push_back(spo)
  * 
  */
-    __pyx_t_3 = __pyx_convert_string_from_py_std__in_string(__pyx_v_sig_name); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 99, __pyx_L1_error)
+    __pyx_t_3 = __pyx_convert_string_from_py_std__in_string(__pyx_v_sig_name); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 95, __pyx_L1_error)
     __pyx_v_spo.name = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_3);
 
-    /* "opendbc/can/parser_pyx.pyx":100
+    /* "opendbc/can/parser_pyx.pyx":96
  *       spo.address = sig_address
  *       spo.name = sig_name
  *       signal_options_v.push_back(spo)             # <<<<<<<<<<<<<<
@@ -5668,10 +5645,10 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       __pyx_v_signal_options_v.push_back(__pyx_v_spo);
     } catch(...) {
       __Pyx_CppExn2PyErr();
-      __PYX_ERR(0, 100, __pyx_L1_error)
+      __PYX_ERR(0, 96, __pyx_L1_error)
     }
 
-    /* "opendbc/can/parser_pyx.pyx":97
+    /* "opendbc/can/parser_pyx.pyx":93
  *     cdef vector[SignalParseOptions] signal_options_v
  *     cdef SignalParseOptions spo
  *     for sig_name, sig_address in signals:             # <<<<<<<<<<<<<<
@@ -5681,36 +5658,36 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
   }
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "opendbc/can/parser_pyx.pyx":102
+  /* "opendbc/can/parser_pyx.pyx":98
  *       signal_options_v.push_back(spo)
  * 
  *     message_options = dict((address, 0) for _, address in signals)             # <<<<<<<<<<<<<<
  *     message_options.update(dict(checks))
  * 
  */
-  __pyx_t_2 = __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_8__init___3genexpr(NULL, __pyx_v_signals); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error)
+  __pyx_t_2 = __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_8__init___3genexpr(NULL, __pyx_v_signals); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 98, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_4 = __Pyx_Generator_Next(__pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 102, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_Generator_Next(__pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 98, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_v_message_options = ((PyObject*)__pyx_t_4);
   __pyx_t_4 = 0;
 
-  /* "opendbc/can/parser_pyx.pyx":103
+  /* "opendbc/can/parser_pyx.pyx":99
  * 
  *     message_options = dict((address, 0) for _, address in signals)
  *     message_options.update(dict(checks))             # <<<<<<<<<<<<<<
  * 
  *     cdef vector[MessageParseOptions] message_options_v
  */
-  __pyx_t_4 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyDict_Type)), __pyx_v_checks); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 103, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyDict_Type)), __pyx_v_checks); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 99, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_2 = __Pyx_CallUnboundCMethod1(&__pyx_umethod_PyDict_Type_update, __pyx_v_message_options, __pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_CallUnboundCMethod1(&__pyx_umethod_PyDict_Type_update, __pyx_v_message_options, __pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 99, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "opendbc/can/parser_pyx.pyx":107
+  /* "opendbc/can/parser_pyx.pyx":103
  *     cdef vector[MessageParseOptions] message_options_v
  *     cdef MessageParseOptions mpo
  *     for msg_address, freq in message_options.items():             # <<<<<<<<<<<<<<
@@ -5720,9 +5697,9 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
   __pyx_t_13 = 0;
   if (unlikely(__pyx_v_message_options == Py_None)) {
     PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "items");
-    __PYX_ERR(0, 107, __pyx_L1_error)
+    __PYX_ERR(0, 103, __pyx_L1_error)
   }
-  __pyx_t_4 = __Pyx_dict_iterator(__pyx_v_message_options, 1, __pyx_n_s_items, (&__pyx_t_14), (&__pyx_t_12)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 107, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_dict_iterator(__pyx_v_message_options, 1, __pyx_n_s_items, (&__pyx_t_14), (&__pyx_t_12)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 103, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_XDECREF(__pyx_t_2);
   __pyx_t_2 = __pyx_t_4;
@@ -5730,7 +5707,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
   while (1) {
     __pyx_t_22 = __Pyx_dict_iter_next(__pyx_t_2, __pyx_t_14, &__pyx_t_13, &__pyx_t_4, &__pyx_t_10, NULL, __pyx_t_12);
     if (unlikely(__pyx_t_22 == 0)) break;
-    if (unlikely(__pyx_t_22 == -1)) __PYX_ERR(0, 107, __pyx_L1_error)
+    if (unlikely(__pyx_t_22 == -1)) __PYX_ERR(0, 103, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_GOTREF(__pyx_t_10);
     __Pyx_XDECREF_SET(__pyx_v_msg_address, __pyx_t_4);
@@ -5738,27 +5715,27 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
     __Pyx_XDECREF_SET(__pyx_v_freq, __pyx_t_10);
     __pyx_t_10 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":108
+    /* "opendbc/can/parser_pyx.pyx":104
  *     cdef MessageParseOptions mpo
  *     for msg_address, freq in message_options.items():
  *       mpo.address = msg_address             # <<<<<<<<<<<<<<
  *       mpo.check_frequency = freq
  *       message_options_v.push_back(mpo)
  */
-    __pyx_t_21 = __Pyx_PyInt_As_uint32_t(__pyx_v_msg_address); if (unlikely((__pyx_t_21 == ((uint32_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 108, __pyx_L1_error)
+    __pyx_t_21 = __Pyx_PyInt_As_uint32_t(__pyx_v_msg_address); if (unlikely((__pyx_t_21 == ((uint32_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 104, __pyx_L1_error)
     __pyx_v_mpo.address = __pyx_t_21;
 
-    /* "opendbc/can/parser_pyx.pyx":109
+    /* "opendbc/can/parser_pyx.pyx":105
  *     for msg_address, freq in message_options.items():
  *       mpo.address = msg_address
  *       mpo.check_frequency = freq             # <<<<<<<<<<<<<<
  *       message_options_v.push_back(mpo)
  * 
  */
-    __pyx_t_22 = __Pyx_PyInt_As_int(__pyx_v_freq); if (unlikely((__pyx_t_22 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 109, __pyx_L1_error)
+    __pyx_t_22 = __Pyx_PyInt_As_int(__pyx_v_freq); if (unlikely((__pyx_t_22 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 105, __pyx_L1_error)
     __pyx_v_mpo.check_frequency = __pyx_t_22;
 
-    /* "opendbc/can/parser_pyx.pyx":110
+    /* "opendbc/can/parser_pyx.pyx":106
  *       mpo.address = msg_address
  *       mpo.check_frequency = freq
  *       message_options_v.push_back(mpo)             # <<<<<<<<<<<<<<
@@ -5769,32 +5746,32 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
       __pyx_v_message_options_v.push_back(__pyx_v_mpo);
     } catch(...) {
       __Pyx_CppExn2PyErr();
-      __PYX_ERR(0, 110, __pyx_L1_error)
+      __PYX_ERR(0, 106, __pyx_L1_error)
     }
   }
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "opendbc/can/parser_pyx.pyx":112
+  /* "opendbc/can/parser_pyx.pyx":108
  *       message_options_v.push_back(mpo)
  * 
  *     self.can = new cpp_CANParser(bus, dbc_name, message_options_v, signal_options_v)             # <<<<<<<<<<<<<<
  *     self.update_strings([])
  * 
  */
-  __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_v_bus); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 112, __pyx_L1_error)
-  __pyx_t_3 = __pyx_convert_string_from_py_std__in_string(__pyx_v_dbc_name); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 112, __pyx_L1_error)
+  __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_v_bus); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 108, __pyx_L1_error)
+  __pyx_t_3 = __pyx_convert_string_from_py_std__in_string(__pyx_v_dbc_name); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 108, __pyx_L1_error)
   __pyx_cur_scope->__pyx_v_self->can = new CANParser(__pyx_t_12, __pyx_t_3, __pyx_v_message_options_v, __pyx_v_signal_options_v);
 
-  /* "opendbc/can/parser_pyx.pyx":113
+  /* "opendbc/can/parser_pyx.pyx":109
  * 
  *     self.can = new cpp_CANParser(bus, dbc_name, message_options_v, signal_options_v)
  *     self.update_strings([])             # <<<<<<<<<<<<<<
  * 
  *   def update_strings(self, strings, sendcan=False):
  */
-  __pyx_t_10 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_cur_scope->__pyx_v_self), __pyx_n_s_update_strings); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 113, __pyx_L1_error)
+  __pyx_t_10 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_cur_scope->__pyx_v_self), __pyx_n_s_update_strings); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 109, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_10);
-  __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 113, __pyx_L1_error)
+  __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 109, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __pyx_t_11 = NULL;
   __pyx_t_12 = 0;
@@ -5813,7 +5790,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
     __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_10, __pyx_callargs+1-__pyx_t_12, 1+__pyx_t_12);
     __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 113, __pyx_L1_error)
+    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 109, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
   }
@@ -5859,13 +5836,12 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANParser___init__(struct __pyx_
   __Pyx_XDECREF(__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___2generator);
   __Pyx_XDECREF(__pyx_gb_7opendbc_3can_10parser_pyx_9CANParser_8__init___5generator1);
   __Pyx_XDECREF(__pyx_v_checks);
-  __Pyx_XDECREF(__pyx_v_enforce_checks);
   __Pyx_DECREF((PyObject *)__pyx_cur_scope);
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "opendbc/can/parser_pyx.pyx":115
+/* "opendbc/can/parser_pyx.pyx":111
  *     self.update_strings([])
  * 
  *   def update_strings(self, strings, sendcan=False):             # <<<<<<<<<<<<<<
@@ -5919,19 +5895,19 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
       switch (__pyx_nargs) {
         case  0:
         if (likely((values[0] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_strings)) != 0)) kw_args--;
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 115, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 111, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_sendcan);
           if (value) { values[1] = value; kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 115, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 111, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "update_strings") < 0)) __PYX_ERR(0, 115, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "update_strings") < 0)) __PYX_ERR(0, 111, __pyx_L3_error)
       }
     } else {
       switch (__pyx_nargs) {
@@ -5947,7 +5923,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("update_strings", 0, 1, 2, __pyx_nargs); __PYX_ERR(0, 115, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("update_strings", 0, 1, 2, __pyx_nargs); __PYX_ERR(0, 111, __pyx_L3_error)
   __pyx_L3_error:;
   __Pyx_AddTraceback("opendbc.can.parser_pyx.CANParser.update_strings", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __Pyx_RefNannyFinishContext();
@@ -5990,7 +5966,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("update_strings", 0);
 
-  /* "opendbc/can/parser_pyx.pyx":116
+  /* "opendbc/can/parser_pyx.pyx":112
  * 
  *   def update_strings(self, strings, sendcan=False):
  *     for v in self.vl_all.values():             # <<<<<<<<<<<<<<
@@ -6000,9 +5976,9 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
   __pyx_t_2 = 0;
   if (unlikely(__pyx_v_self->vl_all == Py_None)) {
     PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "values");
-    __PYX_ERR(0, 116, __pyx_L1_error)
+    __PYX_ERR(0, 112, __pyx_L1_error)
   }
-  __pyx_t_5 = __Pyx_dict_iterator(__pyx_v_self->vl_all, 1, __pyx_n_s_values, (&__pyx_t_3), (&__pyx_t_4)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 116, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_dict_iterator(__pyx_v_self->vl_all, 1, __pyx_n_s_values, (&__pyx_t_3), (&__pyx_t_4)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 112, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_XDECREF(__pyx_t_1);
   __pyx_t_1 = __pyx_t_5;
@@ -6010,12 +5986,12 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
   while (1) {
     __pyx_t_6 = __Pyx_dict_iter_next(__pyx_t_1, __pyx_t_3, &__pyx_t_2, NULL, &__pyx_t_5, NULL, __pyx_t_4);
     if (unlikely(__pyx_t_6 == 0)) break;
-    if (unlikely(__pyx_t_6 == -1)) __PYX_ERR(0, 116, __pyx_L1_error)
+    if (unlikely(__pyx_t_6 == -1)) __PYX_ERR(0, 112, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_XDECREF_SET(__pyx_v_v, __pyx_t_5);
     __pyx_t_5 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":117
+    /* "opendbc/can/parser_pyx.pyx":113
  *   def update_strings(self, strings, sendcan=False):
  *     for v in self.vl_all.values():
  *       for l in v.values():  # no-cython-lint             # <<<<<<<<<<<<<<
@@ -6025,9 +6001,9 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
     __pyx_t_7 = 0;
     if (unlikely(__pyx_v_v == Py_None)) {
       PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "values");
-      __PYX_ERR(0, 117, __pyx_L1_error)
+      __PYX_ERR(0, 113, __pyx_L1_error)
     }
-    __pyx_t_9 = __Pyx_dict_iterator(__pyx_v_v, 0, __pyx_n_s_values, (&__pyx_t_8), (&__pyx_t_6)); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 117, __pyx_L1_error)
+    __pyx_t_9 = __Pyx_dict_iterator(__pyx_v_v, 0, __pyx_n_s_values, (&__pyx_t_8), (&__pyx_t_6)); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 113, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_9);
     __Pyx_XDECREF(__pyx_t_5);
     __pyx_t_5 = __pyx_t_9;
@@ -6035,19 +6011,19 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
     while (1) {
       __pyx_t_10 = __Pyx_dict_iter_next(__pyx_t_5, __pyx_t_8, &__pyx_t_7, NULL, &__pyx_t_9, NULL, __pyx_t_6);
       if (unlikely(__pyx_t_10 == 0)) break;
-      if (unlikely(__pyx_t_10 == -1)) __PYX_ERR(0, 117, __pyx_L1_error)
+      if (unlikely(__pyx_t_10 == -1)) __PYX_ERR(0, 113, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_9);
       __Pyx_XDECREF_SET(__pyx_v_l, __pyx_t_9);
       __pyx_t_9 = 0;
 
-      /* "opendbc/can/parser_pyx.pyx":118
+      /* "opendbc/can/parser_pyx.pyx":114
  *     for v in self.vl_all.values():
  *       for l in v.values():  # no-cython-lint
  *         l.clear()             # <<<<<<<<<<<<<<
  * 
  *     cdef vector[SignalValue] new_vals
  */
-      __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_v_l, __pyx_n_s_clear); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 118, __pyx_L1_error)
+      __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_v_l, __pyx_n_s_clear); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 114, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_11);
       __pyx_t_12 = NULL;
       __pyx_t_10 = 0;
@@ -6065,7 +6041,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
         PyObject *__pyx_callargs[1] = {__pyx_t_12, };
         __pyx_t_9 = __Pyx_PyObject_FastCall(__pyx_t_11, __pyx_callargs+1-__pyx_t_10, 0+__pyx_t_10);
         __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0;
-        if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 118, __pyx_L1_error)
+        if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 114, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_9);
         __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
       }
@@ -6075,18 +6051,18 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "opendbc/can/parser_pyx.pyx":123
+  /* "opendbc/can/parser_pyx.pyx":119
  *     cdef unordered_set[uint32_t] updated_addrs
  * 
  *     self.can.update_strings(strings, new_vals, sendcan)             # <<<<<<<<<<<<<<
  *     cdef vector[SignalValue].iterator it = new_vals.begin()
  *     cdef SignalValue* cv
  */
-  __pyx_t_13 = __pyx_convert_vector_from_py_std_3a__3a_string(__pyx_v_strings); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 123, __pyx_L1_error)
-  __pyx_t_14 = __Pyx_PyObject_IsTrue(__pyx_v_sendcan); if (unlikely((__pyx_t_14 == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 123, __pyx_L1_error)
+  __pyx_t_13 = __pyx_convert_vector_from_py_std_3a__3a_string(__pyx_v_strings); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 119, __pyx_L1_error)
+  __pyx_t_14 = __Pyx_PyObject_IsTrue(__pyx_v_sendcan); if (unlikely((__pyx_t_14 == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 119, __pyx_L1_error)
   __pyx_v_self->can->update_strings(__pyx_t_13, __pyx_v_new_vals, __pyx_t_14);
 
-  /* "opendbc/can/parser_pyx.pyx":124
+  /* "opendbc/can/parser_pyx.pyx":120
  * 
  *     self.can.update_strings(strings, new_vals, sendcan)
  *     cdef vector[SignalValue].iterator it = new_vals.begin()             # <<<<<<<<<<<<<<
@@ -6095,7 +6071,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
  */
   __pyx_v_it = __pyx_v_new_vals.begin();
 
-  /* "opendbc/can/parser_pyx.pyx":126
+  /* "opendbc/can/parser_pyx.pyx":122
  *     cdef vector[SignalValue].iterator it = new_vals.begin()
  *     cdef SignalValue* cv
  *     while it != new_vals.end():             # <<<<<<<<<<<<<<
@@ -6106,7 +6082,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
     __pyx_t_15 = (__pyx_v_it != __pyx_v_new_vals.end());
     if (!__pyx_t_15) break;
 
-    /* "opendbc/can/parser_pyx.pyx":127
+    /* "opendbc/can/parser_pyx.pyx":123
  *     cdef SignalValue* cv
  *     while it != new_vals.end():
  *       cv = &deref(it)             # <<<<<<<<<<<<<<
@@ -6115,14 +6091,14 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
  */
     __pyx_v_cv = (&(*__pyx_v_it));
 
-    /* "opendbc/can/parser_pyx.pyx":129
+    /* "opendbc/can/parser_pyx.pyx":125
  *       cv = &deref(it)
  *       # Cast char * directly to unicode
  *       cv_name = <unicode>cv.name             # <<<<<<<<<<<<<<
  *       self.vl[cv.address][cv_name] = cv.value
  *       self.vl_all[cv.address][cv_name] = cv.all_values
  */
-    __pyx_t_1 = __pyx_convert_PyUnicode_string_to_py_std__in_string(__pyx_v_cv->name); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 129, __pyx_L1_error)
+    __pyx_t_1 = __pyx_convert_PyUnicode_string_to_py_std__in_string(__pyx_v_cv->name); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 125, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __pyx_t_5 = __pyx_t_1;
     __Pyx_INCREF(__pyx_t_5);
@@ -6130,73 +6106,73 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
     __Pyx_XDECREF_SET(__pyx_v_cv_name, ((PyObject*)__pyx_t_5));
     __pyx_t_5 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":130
+    /* "opendbc/can/parser_pyx.pyx":126
  *       # Cast char * directly to unicode
  *       cv_name = <unicode>cv.name
  *       self.vl[cv.address][cv_name] = cv.value             # <<<<<<<<<<<<<<
  *       self.vl_all[cv.address][cv_name] = cv.all_values
  *       self.ts_nanos[cv.address][cv_name] = cv.ts_nanos
  */
-    __pyx_t_5 = PyFloat_FromDouble(__pyx_v_cv->value); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 130, __pyx_L1_error)
+    __pyx_t_5 = PyFloat_FromDouble(__pyx_v_cv->value); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 126, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     if (unlikely(__pyx_v_self->vl == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-      __PYX_ERR(0, 130, __pyx_L1_error)
+      __PYX_ERR(0, 126, __pyx_L1_error)
     }
-    __pyx_t_1 = __Pyx_PyInt_From_uint32_t(__pyx_v_cv->address); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 130, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_PyInt_From_uint32_t(__pyx_v_cv->address); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 126, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
-    __pyx_t_9 = __Pyx_PyDict_GetItem(__pyx_v_self->vl, __pyx_t_1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 130, __pyx_L1_error)
+    __pyx_t_9 = __Pyx_PyDict_GetItem(__pyx_v_self->vl, __pyx_t_1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 126, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_9);
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-    if (unlikely((PyObject_SetItem(__pyx_t_9, __pyx_v_cv_name, __pyx_t_5) < 0))) __PYX_ERR(0, 130, __pyx_L1_error)
+    if (unlikely((PyObject_SetItem(__pyx_t_9, __pyx_v_cv_name, __pyx_t_5) < 0))) __PYX_ERR(0, 126, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":131
+    /* "opendbc/can/parser_pyx.pyx":127
  *       cv_name = <unicode>cv.name
  *       self.vl[cv.address][cv_name] = cv.value
  *       self.vl_all[cv.address][cv_name] = cv.all_values             # <<<<<<<<<<<<<<
  *       self.ts_nanos[cv.address][cv_name] = cv.ts_nanos
  *       updated_addrs.insert(cv.address)
  */
-    __pyx_t_5 = __pyx_convert_vector_to_py_double(__pyx_v_cv->all_values); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 131, __pyx_L1_error)
+    __pyx_t_5 = __pyx_convert_vector_to_py_double(__pyx_v_cv->all_values); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 127, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     if (unlikely(__pyx_v_self->vl_all == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-      __PYX_ERR(0, 131, __pyx_L1_error)
+      __PYX_ERR(0, 127, __pyx_L1_error)
     }
-    __pyx_t_9 = __Pyx_PyInt_From_uint32_t(__pyx_v_cv->address); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 131, __pyx_L1_error)
+    __pyx_t_9 = __Pyx_PyInt_From_uint32_t(__pyx_v_cv->address); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 127, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_9);
-    __pyx_t_1 = __Pyx_PyDict_GetItem(__pyx_v_self->vl_all, __pyx_t_9); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 131, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_PyDict_GetItem(__pyx_v_self->vl_all, __pyx_t_9); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 127, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
-    if (unlikely((PyObject_SetItem(__pyx_t_1, __pyx_v_cv_name, __pyx_t_5) < 0))) __PYX_ERR(0, 131, __pyx_L1_error)
+    if (unlikely((PyObject_SetItem(__pyx_t_1, __pyx_v_cv_name, __pyx_t_5) < 0))) __PYX_ERR(0, 127, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":132
+    /* "opendbc/can/parser_pyx.pyx":128
  *       self.vl[cv.address][cv_name] = cv.value
  *       self.vl_all[cv.address][cv_name] = cv.all_values
  *       self.ts_nanos[cv.address][cv_name] = cv.ts_nanos             # <<<<<<<<<<<<<<
  *       updated_addrs.insert(cv.address)
  *       preinc(it)
  */
-    __pyx_t_5 = __Pyx_PyInt_From_uint64_t(__pyx_v_cv->ts_nanos); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 132, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyInt_From_uint64_t(__pyx_v_cv->ts_nanos); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 128, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     if (unlikely(__pyx_v_self->ts_nanos == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-      __PYX_ERR(0, 132, __pyx_L1_error)
+      __PYX_ERR(0, 128, __pyx_L1_error)
     }
-    __pyx_t_1 = __Pyx_PyInt_From_uint32_t(__pyx_v_cv->address); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 132, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_PyInt_From_uint32_t(__pyx_v_cv->address); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 128, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
-    __pyx_t_9 = __Pyx_PyDict_GetItem(__pyx_v_self->ts_nanos, __pyx_t_1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 132, __pyx_L1_error)
+    __pyx_t_9 = __Pyx_PyDict_GetItem(__pyx_v_self->ts_nanos, __pyx_t_1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 128, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_9);
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-    if (unlikely((PyObject_SetItem(__pyx_t_9, __pyx_v_cv_name, __pyx_t_5) < 0))) __PYX_ERR(0, 132, __pyx_L1_error)
+    if (unlikely((PyObject_SetItem(__pyx_t_9, __pyx_v_cv_name, __pyx_t_5) < 0))) __PYX_ERR(0, 128, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":133
+    /* "opendbc/can/parser_pyx.pyx":129
  *       self.vl_all[cv.address][cv_name] = cv.all_values
  *       self.ts_nanos[cv.address][cv_name] = cv.ts_nanos
  *       updated_addrs.insert(cv.address)             # <<<<<<<<<<<<<<
@@ -6207,10 +6183,10 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
       __pyx_v_updated_addrs.insert(__pyx_v_cv->address);
     } catch(...) {
       __Pyx_CppExn2PyErr();
-      __PYX_ERR(0, 133, __pyx_L1_error)
+      __PYX_ERR(0, 129, __pyx_L1_error)
     }
 
-    /* "opendbc/can/parser_pyx.pyx":134
+    /* "opendbc/can/parser_pyx.pyx":130
  *       self.ts_nanos[cv.address][cv_name] = cv.ts_nanos
  *       updated_addrs.insert(cv.address)
  *       preinc(it)             # <<<<<<<<<<<<<<
@@ -6220,7 +6196,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
     (void)((++__pyx_v_it));
   }
 
-  /* "opendbc/can/parser_pyx.pyx":136
+  /* "opendbc/can/parser_pyx.pyx":132
  *       preinc(it)
  * 
  *     return updated_addrs             # <<<<<<<<<<<<<<
@@ -6228,13 +6204,13 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
  *   @property
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_5 = __pyx_convert_unordered_set_to_py_uint32_t(__pyx_v_updated_addrs); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 136, __pyx_L1_error)
+  __pyx_t_5 = __pyx_convert_unordered_set_to_py_uint32_t(__pyx_v_updated_addrs); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 132, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __pyx_r = __pyx_t_5;
   __pyx_t_5 = 0;
   goto __pyx_L0;
 
-  /* "opendbc/can/parser_pyx.pyx":115
+  /* "opendbc/can/parser_pyx.pyx":111
  *     self.update_strings([])
  * 
  *   def update_strings(self, strings, sendcan=False):             # <<<<<<<<<<<<<<
@@ -6260,7 +6236,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_2update_strings(
   return __pyx_r;
 }
 
-/* "opendbc/can/parser_pyx.pyx":138
+/* "opendbc/can/parser_pyx.pyx":134
  *     return updated_addrs
  * 
  *   @property             # <<<<<<<<<<<<<<
@@ -6291,7 +6267,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_9can_valid___get
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "opendbc/can/parser_pyx.pyx":140
+  /* "opendbc/can/parser_pyx.pyx":136
  *   @property
  *   def can_valid(self):
  *     return self.can.can_valid             # <<<<<<<<<<<<<<
@@ -6299,13 +6275,13 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_9can_valid___get
  *   @property
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __Pyx_PyBool_FromLong(__pyx_v_self->can->can_valid); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 140, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyBool_FromLong(__pyx_v_self->can->can_valid); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 136, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "opendbc/can/parser_pyx.pyx":138
+  /* "opendbc/can/parser_pyx.pyx":134
  *     return updated_addrs
  * 
  *   @property             # <<<<<<<<<<<<<<
@@ -6324,7 +6300,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_9can_valid___get
   return __pyx_r;
 }
 
-/* "opendbc/can/parser_pyx.pyx":142
+/* "opendbc/can/parser_pyx.pyx":138
  *     return self.can.can_valid
  * 
  *   @property             # <<<<<<<<<<<<<<
@@ -6355,7 +6331,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_11bus_timeout___
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "opendbc/can/parser_pyx.pyx":144
+  /* "opendbc/can/parser_pyx.pyx":140
  *   @property
  *   def bus_timeout(self):
  *     return self.can.bus_timeout             # <<<<<<<<<<<<<<
@@ -6363,13 +6339,13 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_11bus_timeout___
  * 
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __Pyx_PyBool_FromLong(__pyx_v_self->can->bus_timeout); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 144, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyBool_FromLong(__pyx_v_self->can->bus_timeout); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 140, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "opendbc/can/parser_pyx.pyx":142
+  /* "opendbc/can/parser_pyx.pyx":138
  *     return self.can.can_valid
  * 
  *   @property             # <<<<<<<<<<<<<<
@@ -6731,7 +6707,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANParser_6__setstate_cyth
   return __pyx_r;
 }
 
-/* "opendbc/can/parser_pyx.pyx":155
+/* "opendbc/can/parser_pyx.pyx":151
  *     string dbc_name
  * 
  *   def __init__(self, dbc_name):             # <<<<<<<<<<<<<<
@@ -6766,12 +6742,12 @@ static int __pyx_pw_7opendbc_3can_10parser_pyx_9CANDefine_1__init__(PyObject *__
       switch (__pyx_nargs) {
         case  0:
         if (likely((values[0] = __Pyx_GetKwValue_VARARGS(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_dbc_name)) != 0)) kw_args--;
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 155, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 151, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 155, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 151, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 1)) {
       goto __pyx_L5_argtuple_error;
@@ -6782,7 +6758,7 @@ static int __pyx_pw_7opendbc_3can_10parser_pyx_9CANDefine_1__init__(PyObject *__
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 155, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 151, __pyx_L3_error)
   __pyx_L3_error:;
   __Pyx_AddTraceback("opendbc.can.parser_pyx.CANDefine.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __Pyx_RefNannyFinishContext();
@@ -6797,7 +6773,7 @@ static int __pyx_pw_7opendbc_3can_10parser_pyx_9CANDefine_1__init__(PyObject *__
 
 static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_obj_7opendbc_3can_10parser_pyx_CANDefine *__pyx_v_self, PyObject *__pyx_v_dbc_name) {
   PyObject *__pyx_v_address_to_msg_name = NULL;
-  std::vector<struct Val> ::size_type __pyx_v_i;
+  std::vector<struct Msg> ::size_type __pyx_v_i;
   struct Msg __pyx_v_msg;
   PyObject *__pyx_v_name = NULL;
   uint32_t __pyx_v_address;
@@ -6819,7 +6795,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
   PyObject *__pyx_t_6 = NULL;
   std::vector<struct Msg> ::size_type __pyx_t_7;
   std::vector<struct Msg> ::size_type __pyx_t_8;
-  std::vector<struct Val> ::size_type __pyx_t_9;
+  std::vector<struct Msg> ::size_type __pyx_t_9;
   uint32_t __pyx_t_10;
   PyObject *__pyx_t_11 = NULL;
   int __pyx_t_12;
@@ -6831,27 +6807,27 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 0);
 
-  /* "opendbc/can/parser_pyx.pyx":156
+  /* "opendbc/can/parser_pyx.pyx":152
  * 
  *   def __init__(self, dbc_name):
  *     self.dbc_name = dbc_name             # <<<<<<<<<<<<<<
  *     self.dbc = dbc_lookup(dbc_name)
  *     if not self.dbc:
  */
-  __pyx_t_1 = __pyx_convert_string_from_py_std__in_string(__pyx_v_dbc_name); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 156, __pyx_L1_error)
+  __pyx_t_1 = __pyx_convert_string_from_py_std__in_string(__pyx_v_dbc_name); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 152, __pyx_L1_error)
   __pyx_v_self->dbc_name = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_1);
 
-  /* "opendbc/can/parser_pyx.pyx":157
+  /* "opendbc/can/parser_pyx.pyx":153
  *   def __init__(self, dbc_name):
  *     self.dbc_name = dbc_name
  *     self.dbc = dbc_lookup(dbc_name)             # <<<<<<<<<<<<<<
  *     if not self.dbc:
  *       raise RuntimeError(f"Can't find DBC: '{dbc_name}'")
  */
-  __pyx_t_1 = __pyx_convert_string_from_py_std__in_string(__pyx_v_dbc_name); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 157, __pyx_L1_error)
+  __pyx_t_1 = __pyx_convert_string_from_py_std__in_string(__pyx_v_dbc_name); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 153, __pyx_L1_error)
   __pyx_v_self->dbc = dbc_lookup(__PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_1));
 
-  /* "opendbc/can/parser_pyx.pyx":158
+  /* "opendbc/can/parser_pyx.pyx":154
  *     self.dbc_name = dbc_name
  *     self.dbc = dbc_lookup(dbc_name)
  *     if not self.dbc:             # <<<<<<<<<<<<<<
@@ -6861,14 +6837,14 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
   __pyx_t_2 = (!(__pyx_v_self->dbc != 0));
   if (unlikely(__pyx_t_2)) {
 
-    /* "opendbc/can/parser_pyx.pyx":159
+    /* "opendbc/can/parser_pyx.pyx":155
  *     self.dbc = dbc_lookup(dbc_name)
  *     if not self.dbc:
  *       raise RuntimeError(f"Can't find DBC: '{dbc_name}'")             # <<<<<<<<<<<<<<
  * 
  *     address_to_msg_name = {}
  */
-    __pyx_t_3 = PyTuple_New(3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 159, __pyx_L1_error)
+    __pyx_t_3 = PyTuple_New(3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 155, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __pyx_t_4 = 0;
     __pyx_t_5 = 127;
@@ -6876,7 +6852,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
     __pyx_t_4 += 17;
     __Pyx_GIVEREF(__pyx_kp_u_Can_t_find_DBC_2);
     PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_u_Can_t_find_DBC_2);
-    __pyx_t_6 = __Pyx_PyObject_FormatSimple(__pyx_v_dbc_name, __pyx_empty_unicode); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 159, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyObject_FormatSimple(__pyx_v_dbc_name, __pyx_empty_unicode); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 155, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __pyx_t_5 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_6) > __pyx_t_5) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_6) : __pyx_t_5;
     __pyx_t_4 += __Pyx_PyUnicode_GET_LENGTH(__pyx_t_6);
@@ -6887,17 +6863,17 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
     __pyx_t_4 += 1;
     __Pyx_GIVEREF(__pyx_kp_u__4);
     PyTuple_SET_ITEM(__pyx_t_3, 2, __pyx_kp_u__4);
-    __pyx_t_6 = __Pyx_PyUnicode_Join(__pyx_t_3, 3, __pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 159, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyUnicode_Join(__pyx_t_3, 3, __pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 155, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_builtin_RuntimeError, __pyx_t_6); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 159, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_builtin_RuntimeError, __pyx_t_6); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 155, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     __Pyx_Raise(__pyx_t_3, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __PYX_ERR(0, 159, __pyx_L1_error)
+    __PYX_ERR(0, 155, __pyx_L1_error)
 
-    /* "opendbc/can/parser_pyx.pyx":158
+    /* "opendbc/can/parser_pyx.pyx":154
  *     self.dbc_name = dbc_name
  *     self.dbc = dbc_lookup(dbc_name)
  *     if not self.dbc:             # <<<<<<<<<<<<<<
@@ -6906,19 +6882,19 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
  */
   }
 
-  /* "opendbc/can/parser_pyx.pyx":161
+  /* "opendbc/can/parser_pyx.pyx":157
  *       raise RuntimeError(f"Can't find DBC: '{dbc_name}'")
  * 
  *     address_to_msg_name = {}             # <<<<<<<<<<<<<<
  * 
  *     for i in range(self.dbc[0].msgs.size()):
  */
-  __pyx_t_3 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 161, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 157, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __pyx_v_address_to_msg_name = ((PyObject*)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "opendbc/can/parser_pyx.pyx":163
+  /* "opendbc/can/parser_pyx.pyx":159
  *     address_to_msg_name = {}
  * 
  *     for i in range(self.dbc[0].msgs.size()):             # <<<<<<<<<<<<<<
@@ -6930,7 +6906,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
   for (__pyx_t_9 = 0; __pyx_t_9 < __pyx_t_8; __pyx_t_9+=1) {
     __pyx_v_i = __pyx_t_9;
 
-    /* "opendbc/can/parser_pyx.pyx":164
+    /* "opendbc/can/parser_pyx.pyx":160
  * 
  *     for i in range(self.dbc[0].msgs.size()):
  *       msg = self.dbc[0].msgs[i]             # <<<<<<<<<<<<<<
@@ -6939,19 +6915,19 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
  */
     __pyx_v_msg = ((__pyx_v_self->dbc[0]).msgs[__pyx_v_i]);
 
-    /* "opendbc/can/parser_pyx.pyx":165
+    /* "opendbc/can/parser_pyx.pyx":161
  *     for i in range(self.dbc[0].msgs.size()):
  *       msg = self.dbc[0].msgs[i]
  *       name = msg.name.decode("utf8")             # <<<<<<<<<<<<<<
  *       address = msg.address
  *       address_to_msg_name[address] = name
  */
-    __pyx_t_3 = __Pyx_decode_cpp_string(__pyx_v_msg.name, 0, PY_SSIZE_T_MAX, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 165, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_decode_cpp_string(__pyx_v_msg.name, 0, PY_SSIZE_T_MAX, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 161, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_XDECREF_SET(__pyx_v_name, __pyx_t_3);
     __pyx_t_3 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":166
+    /* "opendbc/can/parser_pyx.pyx":162
  *       msg = self.dbc[0].msgs[i]
  *       name = msg.name.decode("utf8")
  *       address = msg.address             # <<<<<<<<<<<<<<
@@ -6961,27 +6937,27 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
     __pyx_t_10 = __pyx_v_msg.address;
     __pyx_v_address = __pyx_t_10;
 
-    /* "opendbc/can/parser_pyx.pyx":167
+    /* "opendbc/can/parser_pyx.pyx":163
  *       name = msg.name.decode("utf8")
  *       address = msg.address
  *       address_to_msg_name[address] = name             # <<<<<<<<<<<<<<
  * 
  *     dv = defaultdict(dict)
  */
-    __pyx_t_3 = __Pyx_PyInt_From_uint32_t(__pyx_v_address); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 167, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyInt_From_uint32_t(__pyx_v_address); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 163, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    if (unlikely((PyDict_SetItem(__pyx_v_address_to_msg_name, __pyx_t_3, __pyx_v_name) < 0))) __PYX_ERR(0, 167, __pyx_L1_error)
+    if (unlikely((PyDict_SetItem(__pyx_v_address_to_msg_name, __pyx_t_3, __pyx_v_name) < 0))) __PYX_ERR(0, 163, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   }
 
-  /* "opendbc/can/parser_pyx.pyx":169
+  /* "opendbc/can/parser_pyx.pyx":165
  *       address_to_msg_name[address] = name
  * 
  *     dv = defaultdict(dict)             # <<<<<<<<<<<<<<
  * 
  *     for i in range(self.dbc[0].vals.size()):
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_defaultdict); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 169, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_defaultdict); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 165, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
   __pyx_t_11 = NULL;
   __pyx_t_12 = 0;
@@ -6999,26 +6975,26 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
     PyObject *__pyx_callargs[2] = {__pyx_t_11, ((PyObject *)(&PyDict_Type))};
     __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_6, __pyx_callargs+1-__pyx_t_12, 1+__pyx_t_12);
     __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;
-    if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 169, __pyx_L1_error)
+    if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 165, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   }
   __pyx_v_dv = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "opendbc/can/parser_pyx.pyx":171
+  /* "opendbc/can/parser_pyx.pyx":167
  *     dv = defaultdict(dict)
  * 
  *     for i in range(self.dbc[0].vals.size()):             # <<<<<<<<<<<<<<
  *       val = self.dbc[0].vals[i]
  * 
  */
-  __pyx_t_9 = (__pyx_v_self->dbc[0]).vals.size();
-  __pyx_t_13 = __pyx_t_9;
-  for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) {
-    __pyx_v_i = __pyx_t_14;
+  __pyx_t_13 = (__pyx_v_self->dbc[0]).vals.size();
+  __pyx_t_14 = __pyx_t_13;
+  for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_14; __pyx_t_7+=1) {
+    __pyx_v_i = __pyx_t_7;
 
-    /* "opendbc/can/parser_pyx.pyx":172
+    /* "opendbc/can/parser_pyx.pyx":168
  * 
  *     for i in range(self.dbc[0].vals.size()):
  *       val = self.dbc[0].vals[i]             # <<<<<<<<<<<<<<
@@ -7027,31 +7003,31 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
  */
     __pyx_v_val = ((__pyx_v_self->dbc[0]).vals[__pyx_v_i]);
 
-    /* "opendbc/can/parser_pyx.pyx":174
+    /* "opendbc/can/parser_pyx.pyx":170
  *       val = self.dbc[0].vals[i]
  * 
  *       sgname = val.name.decode("utf8")             # <<<<<<<<<<<<<<
  *       def_val = val.def_val.decode("utf8")
  *       address = val.address
  */
-    __pyx_t_3 = __Pyx_decode_cpp_string(__pyx_v_val.name, 0, PY_SSIZE_T_MAX, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 174, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_decode_cpp_string(__pyx_v_val.name, 0, PY_SSIZE_T_MAX, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 170, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_XDECREF_SET(__pyx_v_sgname, __pyx_t_3);
     __pyx_t_3 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":175
+    /* "opendbc/can/parser_pyx.pyx":171
  * 
  *       sgname = val.name.decode("utf8")
  *       def_val = val.def_val.decode("utf8")             # <<<<<<<<<<<<<<
  *       address = val.address
  *       msgname = address_to_msg_name[address]
  */
-    __pyx_t_3 = __Pyx_decode_cpp_string(__pyx_v_val.def_val, 0, PY_SSIZE_T_MAX, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 175, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_decode_cpp_string(__pyx_v_val.def_val, 0, PY_SSIZE_T_MAX, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 171, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_XDECREF_SET(__pyx_v_def_val, __pyx_t_3);
     __pyx_t_3 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":176
+    /* "opendbc/can/parser_pyx.pyx":172
  *       sgname = val.name.decode("utf8")
  *       def_val = val.def_val.decode("utf8")
  *       address = val.address             # <<<<<<<<<<<<<<
@@ -7061,29 +7037,29 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
     __pyx_t_10 = __pyx_v_val.address;
     __pyx_v_address = __pyx_t_10;
 
-    /* "opendbc/can/parser_pyx.pyx":177
+    /* "opendbc/can/parser_pyx.pyx":173
  *       def_val = val.def_val.decode("utf8")
  *       address = val.address
  *       msgname = address_to_msg_name[address]             # <<<<<<<<<<<<<<
  * 
  *       # separate definition/value pairs
  */
-    __pyx_t_3 = __Pyx_PyInt_From_uint32_t(__pyx_v_address); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 177, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyInt_From_uint32_t(__pyx_v_address); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 173, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_6 = __Pyx_PyDict_GetItem(__pyx_v_address_to_msg_name, __pyx_t_3); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 177, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyDict_GetItem(__pyx_v_address_to_msg_name, __pyx_t_3); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 173, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __Pyx_XDECREF_SET(__pyx_v_msgname, __pyx_t_6);
     __pyx_t_6 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":180
+    /* "opendbc/can/parser_pyx.pyx":176
  * 
  *       # separate definition/value pairs
  *       def_val = def_val.split()             # <<<<<<<<<<<<<<
  *       values = [int(v) for v in def_val[::2]]
  *       defs = def_val[1::2]
  */
-    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_def_val, __pyx_n_s_split); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 180, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_def_val, __pyx_n_s_split); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 176, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __pyx_t_11 = NULL;
     __pyx_t_12 = 0;
@@ -7101,14 +7077,14 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
       PyObject *__pyx_callargs[1] = {__pyx_t_11, };
       __pyx_t_6 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_12, 0+__pyx_t_12);
       __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;
-      if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 180, __pyx_L1_error)
+      if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 176, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_6);
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     }
     __Pyx_DECREF_SET(__pyx_v_def_val, __pyx_t_6);
     __pyx_t_6 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":181
+    /* "opendbc/can/parser_pyx.pyx":177
  *       # separate definition/value pairs
  *       def_val = def_val.split()
  *       values = [int(v) for v in def_val[::2]]             # <<<<<<<<<<<<<<
@@ -7116,17 +7092,17 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
  * 
  */
     { /* enter inner scope */
-      __pyx_t_6 = PyList_New(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 181, __pyx_L10_error)
+      __pyx_t_6 = PyList_New(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 177, __pyx_L10_error)
       __Pyx_GOTREF(__pyx_t_6);
-      __pyx_t_3 = __Pyx_PyObject_GetItem(__pyx_v_def_val, __pyx_slice__5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 181, __pyx_L10_error)
+      __pyx_t_3 = __Pyx_PyObject_GetItem(__pyx_v_def_val, __pyx_slice__5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 177, __pyx_L10_error)
       __Pyx_GOTREF(__pyx_t_3);
       if (likely(PyList_CheckExact(__pyx_t_3)) || PyTuple_CheckExact(__pyx_t_3)) {
         __pyx_t_11 = __pyx_t_3; __Pyx_INCREF(__pyx_t_11); __pyx_t_4 = 0;
         __pyx_t_15 = NULL;
       } else {
-        __pyx_t_4 = -1; __pyx_t_11 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 181, __pyx_L10_error)
+        __pyx_t_4 = -1; __pyx_t_11 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 177, __pyx_L10_error)
         __Pyx_GOTREF(__pyx_t_11);
-        __pyx_t_15 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_11); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 181, __pyx_L10_error)
+        __pyx_t_15 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_11); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 177, __pyx_L10_error)
       }
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
       for (;;) {
@@ -7134,17 +7110,17 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
           if (likely(PyList_CheckExact(__pyx_t_11))) {
             if (__pyx_t_4 >= PyList_GET_SIZE(__pyx_t_11)) break;
             #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-            __pyx_t_3 = PyList_GET_ITEM(__pyx_t_11, __pyx_t_4); __Pyx_INCREF(__pyx_t_3); __pyx_t_4++; if (unlikely((0 < 0))) __PYX_ERR(0, 181, __pyx_L10_error)
+            __pyx_t_3 = PyList_GET_ITEM(__pyx_t_11, __pyx_t_4); __Pyx_INCREF(__pyx_t_3); __pyx_t_4++; if (unlikely((0 < 0))) __PYX_ERR(0, 177, __pyx_L10_error)
             #else
-            __pyx_t_3 = PySequence_ITEM(__pyx_t_11, __pyx_t_4); __pyx_t_4++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 181, __pyx_L10_error)
+            __pyx_t_3 = PySequence_ITEM(__pyx_t_11, __pyx_t_4); __pyx_t_4++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 177, __pyx_L10_error)
             __Pyx_GOTREF(__pyx_t_3);
             #endif
           } else {
             if (__pyx_t_4 >= PyTuple_GET_SIZE(__pyx_t_11)) break;
             #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-            __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_11, __pyx_t_4); __Pyx_INCREF(__pyx_t_3); __pyx_t_4++; if (unlikely((0 < 0))) __PYX_ERR(0, 181, __pyx_L10_error)
+            __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_11, __pyx_t_4); __Pyx_INCREF(__pyx_t_3); __pyx_t_4++; if (unlikely((0 < 0))) __PYX_ERR(0, 177, __pyx_L10_error)
             #else
-            __pyx_t_3 = PySequence_ITEM(__pyx_t_11, __pyx_t_4); __pyx_t_4++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 181, __pyx_L10_error)
+            __pyx_t_3 = PySequence_ITEM(__pyx_t_11, __pyx_t_4); __pyx_t_4++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 177, __pyx_L10_error)
             __Pyx_GOTREF(__pyx_t_3);
             #endif
           }
@@ -7154,7 +7130,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
             PyObject* exc_type = PyErr_Occurred();
             if (exc_type) {
               if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
-              else __PYX_ERR(0, 181, __pyx_L10_error)
+              else __PYX_ERR(0, 177, __pyx_L10_error)
             }
             break;
           }
@@ -7162,9 +7138,9 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
         }
         __Pyx_XDECREF_SET(__pyx_8genexpr4__pyx_v_v, __pyx_t_3);
         __pyx_t_3 = 0;
-        __pyx_t_3 = __Pyx_PyNumber_Int(__pyx_8genexpr4__pyx_v_v); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 181, __pyx_L10_error)
+        __pyx_t_3 = __Pyx_PyNumber_Int(__pyx_8genexpr4__pyx_v_v); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 177, __pyx_L10_error)
         __Pyx_GOTREF(__pyx_t_3);
-        if (unlikely(__Pyx_ListComp_Append(__pyx_t_6, (PyObject*)__pyx_t_3))) __PYX_ERR(0, 181, __pyx_L10_error)
+        if (unlikely(__Pyx_ListComp_Append(__pyx_t_6, (PyObject*)__pyx_t_3))) __PYX_ERR(0, 177, __pyx_L10_error)
         __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
       }
       __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
@@ -7178,26 +7154,26 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
     __Pyx_XDECREF_SET(__pyx_v_values, ((PyObject*)__pyx_t_6));
     __pyx_t_6 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":182
+    /* "opendbc/can/parser_pyx.pyx":178
  *       def_val = def_val.split()
  *       values = [int(v) for v in def_val[::2]]
  *       defs = def_val[1::2]             # <<<<<<<<<<<<<<
  * 
  *       # two ways to lookup: address or msg name
  */
-    __pyx_t_6 = __Pyx_PyObject_GetItem(__pyx_v_def_val, __pyx_slice__6); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 182, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyObject_GetItem(__pyx_v_def_val, __pyx_slice__6); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 178, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_XDECREF_SET(__pyx_v_defs, __pyx_t_6);
     __pyx_t_6 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":185
+    /* "opendbc/can/parser_pyx.pyx":181
  * 
  *       # two ways to lookup: address or msg name
  *       dv[address][sgname] = dict(zip(values, defs))             # <<<<<<<<<<<<<<
  *       dv[msgname][sgname] = dv[address][sgname]
  * 
  */
-    __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 185, __pyx_L1_error)
+    __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 181, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_INCREF(__pyx_v_values);
     __Pyx_GIVEREF(__pyx_v_values);
@@ -7205,43 +7181,43 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
     __Pyx_INCREF(__pyx_v_defs);
     __Pyx_GIVEREF(__pyx_v_defs);
     PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_v_defs);
-    __pyx_t_11 = __Pyx_PyObject_Call(__pyx_builtin_zip, __pyx_t_6, NULL); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 185, __pyx_L1_error)
+    __pyx_t_11 = __Pyx_PyObject_Call(__pyx_builtin_zip, __pyx_t_6, NULL); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 181, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_11);
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-    __pyx_t_6 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyDict_Type)), __pyx_t_11); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 185, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyDict_Type)), __pyx_t_11); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 181, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-    __pyx_t_11 = __Pyx_GetItemInt(__pyx_v_dv, __pyx_v_address, uint32_t, 0, __Pyx_PyInt_From_uint32_t, 0, 0, 1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 185, __pyx_L1_error)
+    __pyx_t_11 = __Pyx_GetItemInt(__pyx_v_dv, __pyx_v_address, uint32_t, 0, __Pyx_PyInt_From_uint32_t, 0, 0, 1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 181, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_11);
-    if (unlikely((PyObject_SetItem(__pyx_t_11, __pyx_v_sgname, __pyx_t_6) < 0))) __PYX_ERR(0, 185, __pyx_L1_error)
+    if (unlikely((PyObject_SetItem(__pyx_t_11, __pyx_v_sgname, __pyx_t_6) < 0))) __PYX_ERR(0, 181, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
 
-    /* "opendbc/can/parser_pyx.pyx":186
+    /* "opendbc/can/parser_pyx.pyx":182
  *       # two ways to lookup: address or msg name
  *       dv[address][sgname] = dict(zip(values, defs))
  *       dv[msgname][sgname] = dv[address][sgname]             # <<<<<<<<<<<<<<
  * 
  *     self.dv = dict(dv)
  */
-    __pyx_t_6 = __Pyx_GetItemInt(__pyx_v_dv, __pyx_v_address, uint32_t, 0, __Pyx_PyInt_From_uint32_t, 0, 0, 1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 186, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_GetItemInt(__pyx_v_dv, __pyx_v_address, uint32_t, 0, __Pyx_PyInt_From_uint32_t, 0, 0, 1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 182, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
-    __pyx_t_11 = __Pyx_PyObject_GetItem(__pyx_t_6, __pyx_v_sgname); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 186, __pyx_L1_error)
+    __pyx_t_11 = __Pyx_PyObject_GetItem(__pyx_t_6, __pyx_v_sgname); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 182, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_11);
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-    __pyx_t_6 = __Pyx_PyObject_GetItem(__pyx_v_dv, __pyx_v_msgname); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 186, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyObject_GetItem(__pyx_v_dv, __pyx_v_msgname); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 182, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
-    if (unlikely((PyObject_SetItem(__pyx_t_6, __pyx_v_sgname, __pyx_t_11) < 0))) __PYX_ERR(0, 186, __pyx_L1_error)
+    if (unlikely((PyObject_SetItem(__pyx_t_6, __pyx_v_sgname, __pyx_t_11) < 0))) __PYX_ERR(0, 182, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
   }
 
-  /* "opendbc/can/parser_pyx.pyx":188
+  /* "opendbc/can/parser_pyx.pyx":184
  *       dv[msgname][sgname] = dv[address][sgname]
  * 
  *     self.dv = dict(dv)             # <<<<<<<<<<<<<<
  */
-  __pyx_t_11 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyDict_Type)), __pyx_v_dv); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 188, __pyx_L1_error)
+  __pyx_t_11 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyDict_Type)), __pyx_v_dv); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 184, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_11);
   __Pyx_GIVEREF(__pyx_t_11);
   __Pyx_GOTREF(__pyx_v_self->dv);
@@ -7249,7 +7225,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
   __pyx_v_self->dv = ((PyObject*)__pyx_t_11);
   __pyx_t_11 = 0;
 
-  /* "opendbc/can/parser_pyx.pyx":155
+  /* "opendbc/can/parser_pyx.pyx":151
  *     string dbc_name
  * 
  *   def __init__(self, dbc_name):             # <<<<<<<<<<<<<<
@@ -7280,7 +7256,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine___init__(struct __pyx_
   return __pyx_r;
 }
 
-/* "opendbc/can/parser_pyx.pyx":152
+/* "opendbc/can/parser_pyx.pyx":148
  * 
  *   cdef public:
  *     dict dv             # <<<<<<<<<<<<<<
@@ -7340,7 +7316,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine_2dv_2__set__(struct __
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__set__", 0);
-  if (!(likely(PyDict_CheckExact(__pyx_v_value))||((__pyx_v_value) == Py_None) || __Pyx_RaiseUnexpectedTypeError("dict", __pyx_v_value))) __PYX_ERR(0, 152, __pyx_L1_error)
+  if (!(likely(PyDict_CheckExact(__pyx_v_value))||((__pyx_v_value) == Py_None) || __Pyx_RaiseUnexpectedTypeError("dict", __pyx_v_value))) __PYX_ERR(0, 148, __pyx_L1_error)
   __pyx_t_1 = __pyx_v_value;
   __Pyx_INCREF(__pyx_t_1);
   __Pyx_GIVEREF(__pyx_t_1);
@@ -7391,7 +7367,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine_2dv_4__del__(struct __
   return __pyx_r;
 }
 
-/* "opendbc/can/parser_pyx.pyx":153
+/* "opendbc/can/parser_pyx.pyx":149
  *   cdef public:
  *     dict dv
  *     string dbc_name             # <<<<<<<<<<<<<<
@@ -7422,7 +7398,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine_8dbc_name___get_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __pyx_convert_PyBytes_string_to_py_std__in_string(__pyx_v_self->dbc_name); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 153, __pyx_L1_error)
+  __pyx_t_1 = __pyx_convert_PyBytes_string_to_py_std__in_string(__pyx_v_self->dbc_name); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 149, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
@@ -7461,7 +7437,7 @@ static int __pyx_pf_7opendbc_3can_10parser_pyx_9CANDefine_8dbc_name_2__set__(str
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__set__", 0);
-  __pyx_t_1 = __pyx_convert_string_from_py_std__in_string(__pyx_v_value); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 153, __pyx_L1_error)
+  __pyx_t_1 = __pyx_convert_string_from_py_std__in_string(__pyx_v_value); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 149, __pyx_L1_error)
   __pyx_v_self->dbc_name = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_1);
 
   /* function exit code */
@@ -8640,11 +8616,11 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
 /* #### Code section: cached_builtins ### */
 static CYTHON_SMALL_CODE int __Pyx_InitCachedBuiltins(void) {
   __pyx_builtin_RuntimeError = __Pyx_GetBuiltinName(__pyx_n_s_RuntimeError); if (!__pyx_builtin_RuntimeError) __PYX_ERR(0, 38, __pyx_L1_error)
-  __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 50, __pyx_L1_error)
-  __pyx_builtin_print = __Pyx_GetBuiltinName(__pyx_n_s_print); if (!__pyx_builtin_print) __PYX_ERR(0, 82, __pyx_L1_error)
-  __pyx_builtin_hex = __Pyx_GetBuiltinName(__pyx_n_s_hex); if (!__pyx_builtin_hex) __PYX_ERR(0, 92, __pyx_L1_error)
+  __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 46, __pyx_L1_error)
+  __pyx_builtin_print = __Pyx_GetBuiltinName(__pyx_n_s_print); if (!__pyx_builtin_print) __PYX_ERR(0, 78, __pyx_L1_error)
+  __pyx_builtin_hex = __Pyx_GetBuiltinName(__pyx_n_s_hex); if (!__pyx_builtin_hex) __PYX_ERR(0, 88, __pyx_L1_error)
   __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(1, 2, __pyx_L1_error)
-  __pyx_builtin_zip = __Pyx_GetBuiltinName(__pyx_n_s_zip); if (!__pyx_builtin_zip) __PYX_ERR(0, 185, __pyx_L1_error)
+  __pyx_builtin_zip = __Pyx_GetBuiltinName(__pyx_n_s_zip); if (!__pyx_builtin_zip) __PYX_ERR(0, 181, __pyx_L1_error)
   __pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) __PYX_ERR(1, 68, __pyx_L1_error)
   return 0;
   __pyx_L1_error:;
@@ -8656,40 +8632,40 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
 
-  /* "opendbc/can/parser_pyx.pyx":181
+  /* "opendbc/can/parser_pyx.pyx":177
  *       # separate definition/value pairs
  *       def_val = def_val.split()
  *       values = [int(v) for v in def_val[::2]]             # <<<<<<<<<<<<<<
  *       defs = def_val[1::2]
  * 
  */
-  __pyx_slice__5 = PySlice_New(Py_None, Py_None, __pyx_int_2); if (unlikely(!__pyx_slice__5)) __PYX_ERR(0, 181, __pyx_L1_error)
+  __pyx_slice__5 = PySlice_New(Py_None, Py_None, __pyx_int_2); if (unlikely(!__pyx_slice__5)) __PYX_ERR(0, 177, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_slice__5);
   __Pyx_GIVEREF(__pyx_slice__5);
 
-  /* "opendbc/can/parser_pyx.pyx":182
+  /* "opendbc/can/parser_pyx.pyx":178
  *       def_val = def_val.split()
  *       values = [int(v) for v in def_val[::2]]
  *       defs = def_val[1::2]             # <<<<<<<<<<<<<<
  * 
  *       # two ways to lookup: address or msg name
  */
-  __pyx_slice__6 = PySlice_New(__pyx_int_1, Py_None, __pyx_int_2); if (unlikely(!__pyx_slice__6)) __PYX_ERR(0, 182, __pyx_L1_error)
+  __pyx_slice__6 = PySlice_New(__pyx_int_1, Py_None, __pyx_int_2); if (unlikely(!__pyx_slice__6)) __PYX_ERR(0, 178, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_slice__6);
   __Pyx_GIVEREF(__pyx_slice__6);
 
-  /* "opendbc/can/parser_pyx.pyx":115
+  /* "opendbc/can/parser_pyx.pyx":111
  *     self.update_strings([])
  * 
  *   def update_strings(self, strings, sendcan=False):             # <<<<<<<<<<<<<<
  *     for v in self.vl_all.values():
  *       for l in v.values():  # no-cython-lint
  */
-  __pyx_tuple__9 = PyTuple_Pack(10, __pyx_n_s_self, __pyx_n_s_strings, __pyx_n_s_sendcan, __pyx_n_s_v, __pyx_n_s_l, __pyx_n_s_new_vals, __pyx_n_s_updated_addrs, __pyx_n_s_it, __pyx_n_s_cv, __pyx_n_s_cv_name); if (unlikely(!__pyx_tuple__9)) __PYX_ERR(0, 115, __pyx_L1_error)
+  __pyx_tuple__9 = PyTuple_Pack(10, __pyx_n_s_self, __pyx_n_s_strings, __pyx_n_s_sendcan, __pyx_n_s_v, __pyx_n_s_l, __pyx_n_s_new_vals, __pyx_n_s_updated_addrs, __pyx_n_s_it, __pyx_n_s_cv, __pyx_n_s_cv_name); if (unlikely(!__pyx_tuple__9)) __PYX_ERR(0, 111, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__9);
   __Pyx_GIVEREF(__pyx_tuple__9);
-  __pyx_codeobj__10 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__9, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_opendbc_can_parser_pyx_pyx, __pyx_n_s_update_strings, 115, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__10)) __PYX_ERR(0, 115, __pyx_L1_error)
-  __pyx_tuple__11 = PyTuple_Pack(1, Py_False); if (unlikely(!__pyx_tuple__11)) __PYX_ERR(0, 115, __pyx_L1_error)
+  __pyx_codeobj__10 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__9, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_opendbc_can_parser_pyx_pyx, __pyx_n_s_update_strings, 111, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__10)) __PYX_ERR(0, 111, __pyx_L1_error)
+  __pyx_tuple__11 = PyTuple_Pack(1, Py_False); if (unlikely(!__pyx_tuple__11)) __PYX_ERR(0, 111, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__11);
   __Pyx_GIVEREF(__pyx_tuple__11);
 
@@ -8819,15 +8795,15 @@ static int __Pyx_modinit_type_init_code(void) {
   if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_7opendbc_3can_10parser_pyx_CANParser) < 0) __PYX_ERR(0, 18, __pyx_L1_error)
   #endif
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_7opendbc_3can_10parser_pyx_CANDefine_spec, NULL); if (unlikely(!__pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine)) __PYX_ERR(0, 147, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_7opendbc_3can_10parser_pyx_CANDefine_spec, __pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine) < 0) __PYX_ERR(0, 147, __pyx_L1_error)
+  __pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_7opendbc_3can_10parser_pyx_CANDefine_spec, NULL); if (unlikely(!__pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine)) __PYX_ERR(0, 143, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_7opendbc_3can_10parser_pyx_CANDefine_spec, __pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine) < 0) __PYX_ERR(0, 143, __pyx_L1_error)
   #else
   __pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine = &__pyx_type_7opendbc_3can_10parser_pyx_CANDefine;
   #endif
   #if !CYTHON_COMPILING_IN_LIMITED_API
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine) < 0) __PYX_ERR(0, 147, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine) < 0) __PYX_ERR(0, 143, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine->tp_print = 0;
@@ -8837,9 +8813,9 @@ static int __Pyx_modinit_type_init_code(void) {
     __pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine->tp_getattro = __Pyx_PyObject_GenericGetAttr;
   }
   #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_CANDefine, (PyObject *) __pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine) < 0) __PYX_ERR(0, 147, __pyx_L1_error)
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_CANDefine, (PyObject *) __pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine) < 0) __PYX_ERR(0, 143, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine) < 0) __PYX_ERR(0, 147, __pyx_L1_error)
+  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_7opendbc_3can_10parser_pyx_CANDefine) < 0) __PYX_ERR(0, 143, __pyx_L1_error)
   #endif
   #if CYTHON_USE_TYPE_SPECS
   __pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct____init__ = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_7opendbc_3can_10parser_pyx___pyx_scope_struct____init___spec, NULL); if (unlikely(!__pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct____init__)) __PYX_ERR(0, 31, __pyx_L1_error)
@@ -8861,15 +8837,15 @@ static int __Pyx_modinit_type_init_code(void) {
   }
   #endif
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr_spec, NULL); if (unlikely(!__pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr)) __PYX_ERR(0, 92, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr_spec, __pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr) < 0) __PYX_ERR(0, 92, __pyx_L1_error)
+  __pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr_spec, NULL); if (unlikely(!__pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr)) __PYX_ERR(0, 88, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr_spec, __pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr) < 0) __PYX_ERR(0, 88, __pyx_L1_error)
   #else
   __pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr = &__pyx_type_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr;
   #endif
   #if !CYTHON_COMPILING_IN_LIMITED_API
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr) < 0) __PYX_ERR(0, 92, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr) < 0) __PYX_ERR(0, 88, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_1_genexpr->tp_print = 0;
@@ -8880,15 +8856,15 @@ static int __Pyx_modinit_type_init_code(void) {
   }
   #endif
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr_spec, NULL); if (unlikely(!__pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr)) __PYX_ERR(0, 102, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr_spec, __pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr) < 0) __PYX_ERR(0, 102, __pyx_L1_error)
+  __pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr_spec, NULL); if (unlikely(!__pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr)) __PYX_ERR(0, 98, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr_spec, __pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr) < 0) __PYX_ERR(0, 98, __pyx_L1_error)
   #else
   __pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr = &__pyx_type_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr;
   #endif
   #if !CYTHON_COMPILING_IN_LIMITED_API
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr) < 0) __PYX_ERR(0, 102, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr) < 0) __PYX_ERR(0, 98, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_7opendbc_3can_10parser_pyx___pyx_scope_struct_2_genexpr->tp_print = 0;
@@ -9243,17 +9219,17 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "opendbc/can/parser_pyx.pyx":115
+  /* "opendbc/can/parser_pyx.pyx":111
  *     self.update_strings([])
  * 
  *   def update_strings(self, strings, sendcan=False):             # <<<<<<<<<<<<<<
  *     for v in self.vl_all.values():
  *       for l in v.values():  # no-cython-lint
  */
-  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7opendbc_3can_10parser_pyx_9CANParser_3update_strings, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_CANParser_update_strings, NULL, __pyx_n_s_opendbc_can_parser_pyx, __pyx_d, ((PyObject *)__pyx_codeobj__10)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 115, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7opendbc_3can_10parser_pyx_9CANParser_3update_strings, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_CANParser_update_strings, NULL, __pyx_n_s_opendbc_can_parser_pyx, __pyx_d, ((PyObject *)__pyx_codeobj__10)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 111, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_3, __pyx_tuple__11);
-  if (PyDict_SetItem((PyObject *)__pyx_ptype_7opendbc_3can_10parser_pyx_CANParser->tp_dict, __pyx_n_s_update_strings, __pyx_t_3) < 0) __PYX_ERR(0, 115, __pyx_L1_error)
+  if (PyDict_SetItem((PyObject *)__pyx_ptype_7opendbc_3can_10parser_pyx_CANParser->tp_dict, __pyx_n_s_update_strings, __pyx_t_3) < 0) __PYX_ERR(0, 111, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   PyType_Modified(__pyx_ptype_7opendbc_3can_10parser_pyx_CANParser);
 
diff --git a/opendbc/can/parser_pyx.so b/opendbc/can/parser_pyx.so
index 921d31a63..943050310 100755
Binary files a/opendbc/can/parser_pyx.so and b/opendbc/can/parser_pyx.so differ
diff --git a/opendbc/toyota_new_mc_pt_generated.dbc b/opendbc/toyota_new_mc_pt_generated.dbc
index e9d95ccd3..476e70f31 100644
--- a/opendbc/toyota_new_mc_pt_generated.dbc
+++ b/opendbc/toyota_new_mc_pt_generated.dbc
@@ -253,7 +253,6 @@ BO_ 1005 REVERSE_CAMERA_STATE: 2 BGM
  SG_ REVERSE_CAMERA_GUIDELINES : 9|2@0+ (1,0) [1|3] "" XXX
 
 BO_ 1009 PCM_CRUISE_ALT: 8 XXX
- SG_ PCM_FOLLOW_DISTANCE : 4|2@1+ (1,0) [0|3] "" XXX
  SG_ MAIN_ON : 13|1@0+ (1,0) [0|3] "" XXX
  SG_ CRUISE_STATE : 10|1@0+ (1,0) [0|1] "" XXX
  SG_ UI_SET_SPEED : 23|8@0+ (1,0) [0|255] "mph" XXX
@@ -261,7 +260,7 @@ BO_ 1009 PCM_CRUISE_ALT: 8 XXX
 BO_ 1020 SOLAR_SENSOR: 8 XXX
  SG_ LUX_SENSOR : 55|13@0+ (1,0) [0|0] "" XXX
 
-BO_ 1041 PCS_HUD: 8 DSU
+BO_ 1041 ACC_HUD: 8 DSU
  SG_ PCS_INDICATOR : 7|2@0+ (1,0) [0|3] "" XXX
  SG_ FCW : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ SET_ME_X20 : 15|8@0+ (1,0) [0|1] "" XXX
@@ -433,7 +432,7 @@ BO_ 1880 DEBUG: 8 XXX
  SG_ BLINDSPOTD2 : 55|8@0+ (1,0) [0|255] "" XXX
 
 CM_ SG_ 36 YAW_RATE "verify";
-CM_ SG_ 36 ACCEL_X "x-axis accel";
+CM_ SG_ 36 STEERING_TORQUE "does not seem the steer torque, tbd";
 CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
 CM_ SG_ 37 STEER_RATE "factor is tbd";
 CM_ SG_ 466 NEUTRAL_FORCE "force in newtons the engine/electric motors are applying without any acceleration commands or user input";
@@ -448,7 +447,7 @@ CM_ SG_ 581 GAS_PEDAL "it seems slightly filtered";
 CM_ SG_ 608 STEER_TORQUE_DRIVER "driver torque";
 CM_ SG_ 608 STEER_OVERRIDE "set when driver torque exceeds a certain value";
 CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
-CM_ SG_ 643 _COUNTER "only used on cars that use this msg for cruise control";
+CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
 CM_ SG_ 835 ACC_TYPE "if 2, car is likely to have a permanent low speed lockout. 1 is ok";
@@ -536,7 +535,6 @@ VAL_ 956 SPORT_ON_2 0 "off" 1 "on";
 VAL_ 956 B_GEAR_ENGAGED 0 "off" 1 "on";
 VAL_ 956 DRIVE_ENGAGED 0 "off" 1 "on";
 VAL_ 1005 REVERSE_CAMERA_GUIDELINES 3 "No guidelines" 2 "Static guidelines" 1 "Active guidelines";
-VAL_ 1009 PCM_FOLLOW_DISTANCE 1 "far" 2 "medium" 3 "close";
 VAL_ 1041 PCS_INDICATOR 2 "PCS Faulted" 1 "PCS Turned Off By User" 0 "PCS Enabled";
 VAL_ 1041 PCS_SENSITIVITY 64 "high sensitivity"  128 "mid sensitivity" 192 "low sensitivity" 0 "off";
 VAL_ 1042 LDA_ALERT 3 "hold with continuous beep" 2 "LDA unavailable" 1 "hold" 0 "none";
diff --git a/opendbc/toyota_nodsu_pt_generated.dbc b/opendbc/toyota_nodsu_pt_generated.dbc
index 7cebae366..37065ab6e 100644
--- a/opendbc/toyota_nodsu_pt_generated.dbc
+++ b/opendbc/toyota_nodsu_pt_generated.dbc
@@ -253,7 +253,6 @@ BO_ 1005 REVERSE_CAMERA_STATE: 2 BGM
  SG_ REVERSE_CAMERA_GUIDELINES : 9|2@0+ (1,0) [1|3] "" XXX
 
 BO_ 1009 PCM_CRUISE_ALT: 8 XXX
- SG_ PCM_FOLLOW_DISTANCE : 4|2@1+ (1,0) [0|3] "" XXX
  SG_ MAIN_ON : 13|1@0+ (1,0) [0|3] "" XXX
  SG_ CRUISE_STATE : 10|1@0+ (1,0) [0|1] "" XXX
  SG_ UI_SET_SPEED : 23|8@0+ (1,0) [0|255] "mph" XXX
@@ -261,7 +260,7 @@ BO_ 1009 PCM_CRUISE_ALT: 8 XXX
 BO_ 1020 SOLAR_SENSOR: 8 XXX
  SG_ LUX_SENSOR : 55|13@0+ (1,0) [0|0] "" XXX
 
-BO_ 1041 PCS_HUD: 8 DSU
+BO_ 1041 ACC_HUD: 8 DSU
  SG_ PCS_INDICATOR : 7|2@0+ (1,0) [0|3] "" XXX
  SG_ FCW : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ SET_ME_X20 : 15|8@0+ (1,0) [0|1] "" XXX
@@ -433,7 +432,7 @@ BO_ 1880 DEBUG: 8 XXX
  SG_ BLINDSPOTD2 : 55|8@0+ (1,0) [0|255] "" XXX
 
 CM_ SG_ 36 YAW_RATE "verify";
-CM_ SG_ 36 ACCEL_X "x-axis accel";
+CM_ SG_ 36 STEERING_TORQUE "does not seem the steer torque, tbd";
 CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
 CM_ SG_ 37 STEER_RATE "factor is tbd";
 CM_ SG_ 466 NEUTRAL_FORCE "force in newtons the engine/electric motors are applying without any acceleration commands or user input";
@@ -448,7 +447,7 @@ CM_ SG_ 581 GAS_PEDAL "it seems slightly filtered";
 CM_ SG_ 608 STEER_TORQUE_DRIVER "driver torque";
 CM_ SG_ 608 STEER_OVERRIDE "set when driver torque exceeds a certain value";
 CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
-CM_ SG_ 643 _COUNTER "only used on cars that use this msg for cruise control";
+CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
 CM_ SG_ 835 ACC_TYPE "if 2, car is likely to have a permanent low speed lockout. 1 is ok";
@@ -536,7 +535,6 @@ VAL_ 956 SPORT_ON_2 0 "off" 1 "on";
 VAL_ 956 B_GEAR_ENGAGED 0 "off" 1 "on";
 VAL_ 956 DRIVE_ENGAGED 0 "off" 1 "on";
 VAL_ 1005 REVERSE_CAMERA_GUIDELINES 3 "No guidelines" 2 "Static guidelines" 1 "Active guidelines";
-VAL_ 1009 PCM_FOLLOW_DISTANCE 1 "far" 2 "medium" 3 "close";
 VAL_ 1041 PCS_INDICATOR 2 "PCS Faulted" 1 "PCS Turned Off By User" 0 "PCS Enabled";
 VAL_ 1041 PCS_SENSITIVITY 64 "high sensitivity"  128 "mid sensitivity" 192 "low sensitivity" 0 "off";
 VAL_ 1042 LDA_ALERT 3 "hold with continuous beep" 2 "LDA unavailable" 1 "hold" 0 "none";
diff --git a/opendbc/toyota_tnga_k_pt_generated.dbc b/opendbc/toyota_tnga_k_pt_generated.dbc
index 03008bd08..3b6b3c534 100644
--- a/opendbc/toyota_tnga_k_pt_generated.dbc
+++ b/opendbc/toyota_tnga_k_pt_generated.dbc
@@ -253,7 +253,6 @@ BO_ 1005 REVERSE_CAMERA_STATE: 2 BGM
  SG_ REVERSE_CAMERA_GUIDELINES : 9|2@0+ (1,0) [1|3] "" XXX
 
 BO_ 1009 PCM_CRUISE_ALT: 8 XXX
- SG_ PCM_FOLLOW_DISTANCE : 4|2@1+ (1,0) [0|3] "" XXX
  SG_ MAIN_ON : 13|1@0+ (1,0) [0|3] "" XXX
  SG_ CRUISE_STATE : 10|1@0+ (1,0) [0|1] "" XXX
  SG_ UI_SET_SPEED : 23|8@0+ (1,0) [0|255] "mph" XXX
@@ -261,7 +260,7 @@ BO_ 1009 PCM_CRUISE_ALT: 8 XXX
 BO_ 1020 SOLAR_SENSOR: 8 XXX
  SG_ LUX_SENSOR : 55|13@0+ (1,0) [0|0] "" XXX
 
-BO_ 1041 PCS_HUD: 8 DSU
+BO_ 1041 ACC_HUD: 8 DSU
  SG_ PCS_INDICATOR : 7|2@0+ (1,0) [0|3] "" XXX
  SG_ FCW : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ SET_ME_X20 : 15|8@0+ (1,0) [0|1] "" XXX
@@ -433,7 +432,7 @@ BO_ 1880 DEBUG: 8 XXX
  SG_ BLINDSPOTD2 : 55|8@0+ (1,0) [0|255] "" XXX
 
 CM_ SG_ 36 YAW_RATE "verify";
-CM_ SG_ 36 ACCEL_X "x-axis accel";
+CM_ SG_ 36 STEERING_TORQUE "does not seem the steer torque, tbd";
 CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
 CM_ SG_ 37 STEER_RATE "factor is tbd";
 CM_ SG_ 466 NEUTRAL_FORCE "force in newtons the engine/electric motors are applying without any acceleration commands or user input";
@@ -448,7 +447,7 @@ CM_ SG_ 581 GAS_PEDAL "it seems slightly filtered";
 CM_ SG_ 608 STEER_TORQUE_DRIVER "driver torque";
 CM_ SG_ 608 STEER_OVERRIDE "set when driver torque exceeds a certain value";
 CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
-CM_ SG_ 643 _COUNTER "only used on cars that use this msg for cruise control";
+CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
 CM_ SG_ 835 ACC_TYPE "if 2, car is likely to have a permanent low speed lockout. 1 is ok";
@@ -536,7 +535,6 @@ VAL_ 956 SPORT_ON_2 0 "off" 1 "on";
 VAL_ 956 B_GEAR_ENGAGED 0 "off" 1 "on";
 VAL_ 956 DRIVE_ENGAGED 0 "off" 1 "on";
 VAL_ 1005 REVERSE_CAMERA_GUIDELINES 3 "No guidelines" 2 "Static guidelines" 1 "Active guidelines";
-VAL_ 1009 PCM_FOLLOW_DISTANCE 1 "far" 2 "medium" 3 "close";
 VAL_ 1041 PCS_INDICATOR 2 "PCS Faulted" 1 "PCS Turned Off By User" 0 "PCS Enabled";
 VAL_ 1041 PCS_SENSITIVITY 64 "high sensitivity"  128 "mid sensitivity" 192 "low sensitivity" 0 "off";
 VAL_ 1042 LDA_ALERT 3 "hold with continuous beep" 2 "LDA unavailable" 1 "hold" 0 "none";
diff --git a/panda/board/obj/bootstub.panda.bin b/panda/board/obj/bootstub.panda.bin
index 9055ea9e0..f179add77 100755
Binary files a/panda/board/obj/bootstub.panda.bin and b/panda/board/obj/bootstub.panda.bin differ
diff --git a/panda/board/obj/panda.bin.signed b/panda/board/obj/panda.bin.signed
index ee373ed65..884dc14c4 100644
Binary files a/panda/board/obj/panda.bin.signed and b/panda/board/obj/panda.bin.signed differ
diff --git a/panda/board/obj/panda_h7.bin.signed b/panda/board/obj/panda_h7.bin.signed
index cd353e8fa..9f0150706 100644
Binary files a/panda/board/obj/panda_h7.bin.signed and b/panda/board/obj/panda_h7.bin.signed differ
diff --git a/panda/python/__init__.py b/panda/python/__init__.py
index 5d86092b7..fbd16f15b 100644
--- a/panda/python/__init__.py
+++ b/panda/python/__init__.py
@@ -7,6 +7,7 @@ import struct
 import hashlib
 import binascii
 import datetime
+import warnings
 import logging
 from functools import wraps
 from typing import Optional
@@ -424,10 +425,10 @@ class Panda:
           if device.getVendorID() == 0xbbaa and device.getProductID() in cls.USB_PIDS:
             try:
               serial = device.getSerialNumber()
-              if len(serial) == 24 or serial == "pedal":
+              if len(serial) == 24:
                 ret.append(serial)
               else:
-                logging.warning(f"found device with panda descriptors but invalid serial: {serial}", RuntimeWarning)
+                warnings.warn(f"found device with panda descriptors but invalid serial: {serial}", RuntimeWarning)
             except Exception:
               continue
     except Exception:
@@ -473,7 +474,11 @@ class Panda:
         success = True
         break
       except Exception:
-        pass
+        try:
+          dfu = PandaDFU(self.get_dfu_serial())
+          dfu.recover()
+        except Exception:
+          pass
       time.sleep(0.1)
     if not success:
       raise Exception("reconnect failed")
@@ -767,6 +772,13 @@ class Panda:
   def enable_deepsleep(self):
     self._handle.controlWrite(Panda.REQUEST_OUT, 0xfb, 0, 0, b'')
 
+  def set_esp_power(self, on):
+    self._handle.controlWrite(Panda.REQUEST_OUT, 0xd9, int(on), 0, b'')
+
+  def esp_reset(self, bootmode=0):
+    self._handle.controlWrite(Panda.REQUEST_OUT, 0xda, int(bootmode), 0, b'')
+    time.sleep(0.2)
+
   def set_safety_mode(self, mode=SAFETY_SILENT, param=0):
     self._handle.controlWrite(Panda.REQUEST_OUT, 0xdc, mode, param, b'')
 
diff --git a/panda/python/isotp.py b/panda/python/isotp.py
index 3334deb8e..45acb6aba 100644
--- a/panda/python/isotp.py
+++ b/panda/python/isotp.py
@@ -6,8 +6,10 @@ DEBUG = False
 def msg(x):
   if DEBUG:
     print("S:", binascii.hexlify(x))
-  assert len(x) <= 7
-  ret = bytes([len(x)]) + x
+  if len(x) <= 7:
+    ret = bytes([len(x)]) + x
+  else:
+    assert False
   return ret.ljust(8, b"\x00")
 
 kmsgs = []
@@ -54,7 +56,7 @@ def isotp_recv_subaddr(panda, addr, bus, sendaddr, subaddr):
     dat = msg[2:]
   else:
     print(binascii.hexlify(msg))
-    raise AssertionError
+    assert False
 
   return dat[0:tlen]
 
@@ -131,7 +133,7 @@ def isotp_recv(panda, addr, bus=0, sendaddr=None, subaddr=None):
       tlen = msg[0] & 0xf
       dat = msg[1:]
     else:
-      raise AssertionError
+      assert False
     dat = dat[0:tlen]
 
   if DEBUG:
diff --git a/panda/python/spi.py b/panda/python/spi.py
index 0be28f49c..ad0225b1e 100644
--- a/panda/python/spi.py
+++ b/panda/python/spi.py
@@ -314,7 +314,7 @@ class STBootloaderSPIHandle(BaseSTBootloaderHandle):
 
       self._mcu_type = MCU_TYPE_BY_IDCODE[self.get_chip_id()]
     except PandaSpiException:
-      raise PandaSpiException("failed to connect to panda") from None
+      raise PandaSpiException("failed to connect to panda")  # pylint: disable=W0707
 
   def _get_ack(self, spi, timeout=1.0):
     data = 0x00
diff --git a/rednose/helpers/ekf_sym_pyx.so b/rednose/helpers/ekf_sym_pyx.so
index 1bf271437..334869063 100755
Binary files a/rednose/helpers/ekf_sym_pyx.so and b/rednose/helpers/ekf_sym_pyx.so differ
diff --git a/selfdrive/boardd/boardd b/selfdrive/boardd/boardd
index f9bd80e67..b7f71c494 100755
Binary files a/selfdrive/boardd/boardd and b/selfdrive/boardd/boardd differ
diff --git a/selfdrive/boardd/boardd_api_impl.so b/selfdrive/boardd/boardd_api_impl.so
index 585d5254b..18fd369de 100755
Binary files a/selfdrive/boardd/boardd_api_impl.so and b/selfdrive/boardd/boardd_api_impl.so differ
diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py
index 676f5407d..c9a6fb82b 100755
--- a/selfdrive/controls/controlsd.py
+++ b/selfdrive/controls/controlsd.py
@@ -646,7 +646,7 @@ class Controls:
                    (not standstill or self.joystick_mode)
     CC.longActive = self.enabled and not self.events.any(ET.OVERRIDE_LONGITUDINAL) and self.CP.openpilotLongitudinalControl
 
-    if self._dp_alka_active and not standstill and CS.cruiseState.available:
+    if not self.read_only and self.initialized and self._dp_alka_active and not standstill and CS.cruiseState.available:
       if self.sm['liveCalibration'].calStatus != log.LiveCalibrationData.Status.calibrated:
         pass
       elif CS.steerFaultTemporary or CS.steerFaultPermanent:
diff --git a/selfdrive/locationd/locationd b/selfdrive/locationd/locationd
index ede24603a..6c5ab754f 100755
Binary files a/selfdrive/locationd/locationd and b/selfdrive/locationd/locationd differ
diff --git a/selfdrive/locationd/models/generated/car.cpp b/selfdrive/locationd/models/generated/car.cpp
index cb0b9c52f..617433932 100644
--- a/selfdrive/locationd/models/generated/car.cpp
+++ b/selfdrive/locationd/models/generated/car.cpp
@@ -45,326 +45,326 @@ const static double MAHA_THRESH_31 = 3.8414588206941227;
  *                                                                            *
  *                         This file is part of 'ekf'                         *
  ******************************************************************************/
-void err_fun(double *nom_x, double *delta_x, double *out_8412408275907562510) {
-   out_8412408275907562510[0] = delta_x[0] + nom_x[0];
-   out_8412408275907562510[1] = delta_x[1] + nom_x[1];
-   out_8412408275907562510[2] = delta_x[2] + nom_x[2];
-   out_8412408275907562510[3] = delta_x[3] + nom_x[3];
-   out_8412408275907562510[4] = delta_x[4] + nom_x[4];
-   out_8412408275907562510[5] = delta_x[5] + nom_x[5];
-   out_8412408275907562510[6] = delta_x[6] + nom_x[6];
-   out_8412408275907562510[7] = delta_x[7] + nom_x[7];
-   out_8412408275907562510[8] = delta_x[8] + nom_x[8];
+void err_fun(double *nom_x, double *delta_x, double *out_1282327502940326821) {
+   out_1282327502940326821[0] = delta_x[0] + nom_x[0];
+   out_1282327502940326821[1] = delta_x[1] + nom_x[1];
+   out_1282327502940326821[2] = delta_x[2] + nom_x[2];
+   out_1282327502940326821[3] = delta_x[3] + nom_x[3];
+   out_1282327502940326821[4] = delta_x[4] + nom_x[4];
+   out_1282327502940326821[5] = delta_x[5] + nom_x[5];
+   out_1282327502940326821[6] = delta_x[6] + nom_x[6];
+   out_1282327502940326821[7] = delta_x[7] + nom_x[7];
+   out_1282327502940326821[8] = delta_x[8] + nom_x[8];
 }
-void inv_err_fun(double *nom_x, double *true_x, double *out_5009429012443487067) {
-   out_5009429012443487067[0] = -nom_x[0] + true_x[0];
-   out_5009429012443487067[1] = -nom_x[1] + true_x[1];
-   out_5009429012443487067[2] = -nom_x[2] + true_x[2];
-   out_5009429012443487067[3] = -nom_x[3] + true_x[3];
-   out_5009429012443487067[4] = -nom_x[4] + true_x[4];
-   out_5009429012443487067[5] = -nom_x[5] + true_x[5];
-   out_5009429012443487067[6] = -nom_x[6] + true_x[6];
-   out_5009429012443487067[7] = -nom_x[7] + true_x[7];
-   out_5009429012443487067[8] = -nom_x[8] + true_x[8];
+void inv_err_fun(double *nom_x, double *true_x, double *out_4590721196226970281) {
+   out_4590721196226970281[0] = -nom_x[0] + true_x[0];
+   out_4590721196226970281[1] = -nom_x[1] + true_x[1];
+   out_4590721196226970281[2] = -nom_x[2] + true_x[2];
+   out_4590721196226970281[3] = -nom_x[3] + true_x[3];
+   out_4590721196226970281[4] = -nom_x[4] + true_x[4];
+   out_4590721196226970281[5] = -nom_x[5] + true_x[5];
+   out_4590721196226970281[6] = -nom_x[6] + true_x[6];
+   out_4590721196226970281[7] = -nom_x[7] + true_x[7];
+   out_4590721196226970281[8] = -nom_x[8] + true_x[8];
 }
-void H_mod_fun(double *state, double *out_7201068384612818103) {
-   out_7201068384612818103[0] = 1.0;
-   out_7201068384612818103[1] = 0;
-   out_7201068384612818103[2] = 0;
-   out_7201068384612818103[3] = 0;
-   out_7201068384612818103[4] = 0;
-   out_7201068384612818103[5] = 0;
-   out_7201068384612818103[6] = 0;
-   out_7201068384612818103[7] = 0;
-   out_7201068384612818103[8] = 0;
-   out_7201068384612818103[9] = 0;
-   out_7201068384612818103[10] = 1.0;
-   out_7201068384612818103[11] = 0;
-   out_7201068384612818103[12] = 0;
-   out_7201068384612818103[13] = 0;
-   out_7201068384612818103[14] = 0;
-   out_7201068384612818103[15] = 0;
-   out_7201068384612818103[16] = 0;
-   out_7201068384612818103[17] = 0;
-   out_7201068384612818103[18] = 0;
-   out_7201068384612818103[19] = 0;
-   out_7201068384612818103[20] = 1.0;
-   out_7201068384612818103[21] = 0;
-   out_7201068384612818103[22] = 0;
-   out_7201068384612818103[23] = 0;
-   out_7201068384612818103[24] = 0;
-   out_7201068384612818103[25] = 0;
-   out_7201068384612818103[26] = 0;
-   out_7201068384612818103[27] = 0;
-   out_7201068384612818103[28] = 0;
-   out_7201068384612818103[29] = 0;
-   out_7201068384612818103[30] = 1.0;
-   out_7201068384612818103[31] = 0;
-   out_7201068384612818103[32] = 0;
-   out_7201068384612818103[33] = 0;
-   out_7201068384612818103[34] = 0;
-   out_7201068384612818103[35] = 0;
-   out_7201068384612818103[36] = 0;
-   out_7201068384612818103[37] = 0;
-   out_7201068384612818103[38] = 0;
-   out_7201068384612818103[39] = 0;
-   out_7201068384612818103[40] = 1.0;
-   out_7201068384612818103[41] = 0;
-   out_7201068384612818103[42] = 0;
-   out_7201068384612818103[43] = 0;
-   out_7201068384612818103[44] = 0;
-   out_7201068384612818103[45] = 0;
-   out_7201068384612818103[46] = 0;
-   out_7201068384612818103[47] = 0;
-   out_7201068384612818103[48] = 0;
-   out_7201068384612818103[49] = 0;
-   out_7201068384612818103[50] = 1.0;
-   out_7201068384612818103[51] = 0;
-   out_7201068384612818103[52] = 0;
-   out_7201068384612818103[53] = 0;
-   out_7201068384612818103[54] = 0;
-   out_7201068384612818103[55] = 0;
-   out_7201068384612818103[56] = 0;
-   out_7201068384612818103[57] = 0;
-   out_7201068384612818103[58] = 0;
-   out_7201068384612818103[59] = 0;
-   out_7201068384612818103[60] = 1.0;
-   out_7201068384612818103[61] = 0;
-   out_7201068384612818103[62] = 0;
-   out_7201068384612818103[63] = 0;
-   out_7201068384612818103[64] = 0;
-   out_7201068384612818103[65] = 0;
-   out_7201068384612818103[66] = 0;
-   out_7201068384612818103[67] = 0;
-   out_7201068384612818103[68] = 0;
-   out_7201068384612818103[69] = 0;
-   out_7201068384612818103[70] = 1.0;
-   out_7201068384612818103[71] = 0;
-   out_7201068384612818103[72] = 0;
-   out_7201068384612818103[73] = 0;
-   out_7201068384612818103[74] = 0;
-   out_7201068384612818103[75] = 0;
-   out_7201068384612818103[76] = 0;
-   out_7201068384612818103[77] = 0;
-   out_7201068384612818103[78] = 0;
-   out_7201068384612818103[79] = 0;
-   out_7201068384612818103[80] = 1.0;
+void H_mod_fun(double *state, double *out_2163953626510216661) {
+   out_2163953626510216661[0] = 1.0;
+   out_2163953626510216661[1] = 0;
+   out_2163953626510216661[2] = 0;
+   out_2163953626510216661[3] = 0;
+   out_2163953626510216661[4] = 0;
+   out_2163953626510216661[5] = 0;
+   out_2163953626510216661[6] = 0;
+   out_2163953626510216661[7] = 0;
+   out_2163953626510216661[8] = 0;
+   out_2163953626510216661[9] = 0;
+   out_2163953626510216661[10] = 1.0;
+   out_2163953626510216661[11] = 0;
+   out_2163953626510216661[12] = 0;
+   out_2163953626510216661[13] = 0;
+   out_2163953626510216661[14] = 0;
+   out_2163953626510216661[15] = 0;
+   out_2163953626510216661[16] = 0;
+   out_2163953626510216661[17] = 0;
+   out_2163953626510216661[18] = 0;
+   out_2163953626510216661[19] = 0;
+   out_2163953626510216661[20] = 1.0;
+   out_2163953626510216661[21] = 0;
+   out_2163953626510216661[22] = 0;
+   out_2163953626510216661[23] = 0;
+   out_2163953626510216661[24] = 0;
+   out_2163953626510216661[25] = 0;
+   out_2163953626510216661[26] = 0;
+   out_2163953626510216661[27] = 0;
+   out_2163953626510216661[28] = 0;
+   out_2163953626510216661[29] = 0;
+   out_2163953626510216661[30] = 1.0;
+   out_2163953626510216661[31] = 0;
+   out_2163953626510216661[32] = 0;
+   out_2163953626510216661[33] = 0;
+   out_2163953626510216661[34] = 0;
+   out_2163953626510216661[35] = 0;
+   out_2163953626510216661[36] = 0;
+   out_2163953626510216661[37] = 0;
+   out_2163953626510216661[38] = 0;
+   out_2163953626510216661[39] = 0;
+   out_2163953626510216661[40] = 1.0;
+   out_2163953626510216661[41] = 0;
+   out_2163953626510216661[42] = 0;
+   out_2163953626510216661[43] = 0;
+   out_2163953626510216661[44] = 0;
+   out_2163953626510216661[45] = 0;
+   out_2163953626510216661[46] = 0;
+   out_2163953626510216661[47] = 0;
+   out_2163953626510216661[48] = 0;
+   out_2163953626510216661[49] = 0;
+   out_2163953626510216661[50] = 1.0;
+   out_2163953626510216661[51] = 0;
+   out_2163953626510216661[52] = 0;
+   out_2163953626510216661[53] = 0;
+   out_2163953626510216661[54] = 0;
+   out_2163953626510216661[55] = 0;
+   out_2163953626510216661[56] = 0;
+   out_2163953626510216661[57] = 0;
+   out_2163953626510216661[58] = 0;
+   out_2163953626510216661[59] = 0;
+   out_2163953626510216661[60] = 1.0;
+   out_2163953626510216661[61] = 0;
+   out_2163953626510216661[62] = 0;
+   out_2163953626510216661[63] = 0;
+   out_2163953626510216661[64] = 0;
+   out_2163953626510216661[65] = 0;
+   out_2163953626510216661[66] = 0;
+   out_2163953626510216661[67] = 0;
+   out_2163953626510216661[68] = 0;
+   out_2163953626510216661[69] = 0;
+   out_2163953626510216661[70] = 1.0;
+   out_2163953626510216661[71] = 0;
+   out_2163953626510216661[72] = 0;
+   out_2163953626510216661[73] = 0;
+   out_2163953626510216661[74] = 0;
+   out_2163953626510216661[75] = 0;
+   out_2163953626510216661[76] = 0;
+   out_2163953626510216661[77] = 0;
+   out_2163953626510216661[78] = 0;
+   out_2163953626510216661[79] = 0;
+   out_2163953626510216661[80] = 1.0;
 }
-void f_fun(double *state, double dt, double *out_2117395969407442559) {
-   out_2117395969407442559[0] = state[0];
-   out_2117395969407442559[1] = state[1];
-   out_2117395969407442559[2] = state[2];
-   out_2117395969407442559[3] = state[3];
-   out_2117395969407442559[4] = state[4];
-   out_2117395969407442559[5] = dt*((-state[4] + (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(mass*state[4]))*state[6] - 9.8000000000000007*state[8] + stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(mass*state[1]) + (-stiffness_front*state[0] - stiffness_rear*state[0])*state[5]/(mass*state[4])) + state[5];
-   out_2117395969407442559[6] = dt*(center_to_front*stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(rotational_inertia*state[1]) + (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])*state[5]/(rotational_inertia*state[4]) + (-pow(center_to_front, 2)*stiffness_front*state[0] - pow(center_to_rear, 2)*stiffness_rear*state[0])*state[6]/(rotational_inertia*state[4])) + state[6];
-   out_2117395969407442559[7] = state[7];
-   out_2117395969407442559[8] = state[8];
+void f_fun(double *state, double dt, double *out_405606070335708994) {
+   out_405606070335708994[0] = state[0];
+   out_405606070335708994[1] = state[1];
+   out_405606070335708994[2] = state[2];
+   out_405606070335708994[3] = state[3];
+   out_405606070335708994[4] = state[4];
+   out_405606070335708994[5] = dt*((-state[4] + (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(mass*state[4]))*state[6] - 9.8000000000000007*state[8] + stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(mass*state[1]) + (-stiffness_front*state[0] - stiffness_rear*state[0])*state[5]/(mass*state[4])) + state[5];
+   out_405606070335708994[6] = dt*(center_to_front*stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(rotational_inertia*state[1]) + (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])*state[5]/(rotational_inertia*state[4]) + (-pow(center_to_front, 2)*stiffness_front*state[0] - pow(center_to_rear, 2)*stiffness_rear*state[0])*state[6]/(rotational_inertia*state[4])) + state[6];
+   out_405606070335708994[7] = state[7];
+   out_405606070335708994[8] = state[8];
 }
-void F_fun(double *state, double dt, double *out_1930106235119052766) {
-   out_1930106235119052766[0] = 1;
-   out_1930106235119052766[1] = 0;
-   out_1930106235119052766[2] = 0;
-   out_1930106235119052766[3] = 0;
-   out_1930106235119052766[4] = 0;
-   out_1930106235119052766[5] = 0;
-   out_1930106235119052766[6] = 0;
-   out_1930106235119052766[7] = 0;
-   out_1930106235119052766[8] = 0;
-   out_1930106235119052766[9] = 0;
-   out_1930106235119052766[10] = 1;
-   out_1930106235119052766[11] = 0;
-   out_1930106235119052766[12] = 0;
-   out_1930106235119052766[13] = 0;
-   out_1930106235119052766[14] = 0;
-   out_1930106235119052766[15] = 0;
-   out_1930106235119052766[16] = 0;
-   out_1930106235119052766[17] = 0;
-   out_1930106235119052766[18] = 0;
-   out_1930106235119052766[19] = 0;
-   out_1930106235119052766[20] = 1;
-   out_1930106235119052766[21] = 0;
-   out_1930106235119052766[22] = 0;
-   out_1930106235119052766[23] = 0;
-   out_1930106235119052766[24] = 0;
-   out_1930106235119052766[25] = 0;
-   out_1930106235119052766[26] = 0;
-   out_1930106235119052766[27] = 0;
-   out_1930106235119052766[28] = 0;
-   out_1930106235119052766[29] = 0;
-   out_1930106235119052766[30] = 1;
-   out_1930106235119052766[31] = 0;
-   out_1930106235119052766[32] = 0;
-   out_1930106235119052766[33] = 0;
-   out_1930106235119052766[34] = 0;
-   out_1930106235119052766[35] = 0;
-   out_1930106235119052766[36] = 0;
-   out_1930106235119052766[37] = 0;
-   out_1930106235119052766[38] = 0;
-   out_1930106235119052766[39] = 0;
-   out_1930106235119052766[40] = 1;
-   out_1930106235119052766[41] = 0;
-   out_1930106235119052766[42] = 0;
-   out_1930106235119052766[43] = 0;
-   out_1930106235119052766[44] = 0;
-   out_1930106235119052766[45] = dt*(stiffness_front*(-state[2] - state[3] + state[7])/(mass*state[1]) + (-stiffness_front - stiffness_rear)*state[5]/(mass*state[4]) + (-center_to_front*stiffness_front + center_to_rear*stiffness_rear)*state[6]/(mass*state[4]));
-   out_1930106235119052766[46] = -dt*stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(mass*pow(state[1], 2));
-   out_1930106235119052766[47] = -dt*stiffness_front*state[0]/(mass*state[1]);
-   out_1930106235119052766[48] = -dt*stiffness_front*state[0]/(mass*state[1]);
-   out_1930106235119052766[49] = dt*((-1 - (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(mass*pow(state[4], 2)))*state[6] - (-stiffness_front*state[0] - stiffness_rear*state[0])*state[5]/(mass*pow(state[4], 2)));
-   out_1930106235119052766[50] = dt*(-stiffness_front*state[0] - stiffness_rear*state[0])/(mass*state[4]) + 1;
-   out_1930106235119052766[51] = dt*(-state[4] + (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(mass*state[4]));
-   out_1930106235119052766[52] = dt*stiffness_front*state[0]/(mass*state[1]);
-   out_1930106235119052766[53] = -9.8000000000000007*dt;
-   out_1930106235119052766[54] = dt*(center_to_front*stiffness_front*(-state[2] - state[3] + state[7])/(rotational_inertia*state[1]) + (-center_to_front*stiffness_front + center_to_rear*stiffness_rear)*state[5]/(rotational_inertia*state[4]) + (-pow(center_to_front, 2)*stiffness_front - pow(center_to_rear, 2)*stiffness_rear)*state[6]/(rotational_inertia*state[4]));
-   out_1930106235119052766[55] = -center_to_front*dt*stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(rotational_inertia*pow(state[1], 2));
-   out_1930106235119052766[56] = -center_to_front*dt*stiffness_front*state[0]/(rotational_inertia*state[1]);
-   out_1930106235119052766[57] = -center_to_front*dt*stiffness_front*state[0]/(rotational_inertia*state[1]);
-   out_1930106235119052766[58] = dt*(-(-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])*state[5]/(rotational_inertia*pow(state[4], 2)) - (-pow(center_to_front, 2)*stiffness_front*state[0] - pow(center_to_rear, 2)*stiffness_rear*state[0])*state[6]/(rotational_inertia*pow(state[4], 2)));
-   out_1930106235119052766[59] = dt*(-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(rotational_inertia*state[4]);
-   out_1930106235119052766[60] = dt*(-pow(center_to_front, 2)*stiffness_front*state[0] - pow(center_to_rear, 2)*stiffness_rear*state[0])/(rotational_inertia*state[4]) + 1;
-   out_1930106235119052766[61] = center_to_front*dt*stiffness_front*state[0]/(rotational_inertia*state[1]);
-   out_1930106235119052766[62] = 0;
-   out_1930106235119052766[63] = 0;
-   out_1930106235119052766[64] = 0;
-   out_1930106235119052766[65] = 0;
-   out_1930106235119052766[66] = 0;
-   out_1930106235119052766[67] = 0;
-   out_1930106235119052766[68] = 0;
-   out_1930106235119052766[69] = 0;
-   out_1930106235119052766[70] = 1;
-   out_1930106235119052766[71] = 0;
-   out_1930106235119052766[72] = 0;
-   out_1930106235119052766[73] = 0;
-   out_1930106235119052766[74] = 0;
-   out_1930106235119052766[75] = 0;
-   out_1930106235119052766[76] = 0;
-   out_1930106235119052766[77] = 0;
-   out_1930106235119052766[78] = 0;
-   out_1930106235119052766[79] = 0;
-   out_1930106235119052766[80] = 1;
+void F_fun(double *state, double dt, double *out_7303340041697938188) {
+   out_7303340041697938188[0] = 1;
+   out_7303340041697938188[1] = 0;
+   out_7303340041697938188[2] = 0;
+   out_7303340041697938188[3] = 0;
+   out_7303340041697938188[4] = 0;
+   out_7303340041697938188[5] = 0;
+   out_7303340041697938188[6] = 0;
+   out_7303340041697938188[7] = 0;
+   out_7303340041697938188[8] = 0;
+   out_7303340041697938188[9] = 0;
+   out_7303340041697938188[10] = 1;
+   out_7303340041697938188[11] = 0;
+   out_7303340041697938188[12] = 0;
+   out_7303340041697938188[13] = 0;
+   out_7303340041697938188[14] = 0;
+   out_7303340041697938188[15] = 0;
+   out_7303340041697938188[16] = 0;
+   out_7303340041697938188[17] = 0;
+   out_7303340041697938188[18] = 0;
+   out_7303340041697938188[19] = 0;
+   out_7303340041697938188[20] = 1;
+   out_7303340041697938188[21] = 0;
+   out_7303340041697938188[22] = 0;
+   out_7303340041697938188[23] = 0;
+   out_7303340041697938188[24] = 0;
+   out_7303340041697938188[25] = 0;
+   out_7303340041697938188[26] = 0;
+   out_7303340041697938188[27] = 0;
+   out_7303340041697938188[28] = 0;
+   out_7303340041697938188[29] = 0;
+   out_7303340041697938188[30] = 1;
+   out_7303340041697938188[31] = 0;
+   out_7303340041697938188[32] = 0;
+   out_7303340041697938188[33] = 0;
+   out_7303340041697938188[34] = 0;
+   out_7303340041697938188[35] = 0;
+   out_7303340041697938188[36] = 0;
+   out_7303340041697938188[37] = 0;
+   out_7303340041697938188[38] = 0;
+   out_7303340041697938188[39] = 0;
+   out_7303340041697938188[40] = 1;
+   out_7303340041697938188[41] = 0;
+   out_7303340041697938188[42] = 0;
+   out_7303340041697938188[43] = 0;
+   out_7303340041697938188[44] = 0;
+   out_7303340041697938188[45] = dt*(stiffness_front*(-state[2] - state[3] + state[7])/(mass*state[1]) + (-stiffness_front - stiffness_rear)*state[5]/(mass*state[4]) + (-center_to_front*stiffness_front + center_to_rear*stiffness_rear)*state[6]/(mass*state[4]));
+   out_7303340041697938188[46] = -dt*stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(mass*pow(state[1], 2));
+   out_7303340041697938188[47] = -dt*stiffness_front*state[0]/(mass*state[1]);
+   out_7303340041697938188[48] = -dt*stiffness_front*state[0]/(mass*state[1]);
+   out_7303340041697938188[49] = dt*((-1 - (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(mass*pow(state[4], 2)))*state[6] - (-stiffness_front*state[0] - stiffness_rear*state[0])*state[5]/(mass*pow(state[4], 2)));
+   out_7303340041697938188[50] = dt*(-stiffness_front*state[0] - stiffness_rear*state[0])/(mass*state[4]) + 1;
+   out_7303340041697938188[51] = dt*(-state[4] + (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(mass*state[4]));
+   out_7303340041697938188[52] = dt*stiffness_front*state[0]/(mass*state[1]);
+   out_7303340041697938188[53] = -9.8000000000000007*dt;
+   out_7303340041697938188[54] = dt*(center_to_front*stiffness_front*(-state[2] - state[3] + state[7])/(rotational_inertia*state[1]) + (-center_to_front*stiffness_front + center_to_rear*stiffness_rear)*state[5]/(rotational_inertia*state[4]) + (-pow(center_to_front, 2)*stiffness_front - pow(center_to_rear, 2)*stiffness_rear)*state[6]/(rotational_inertia*state[4]));
+   out_7303340041697938188[55] = -center_to_front*dt*stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(rotational_inertia*pow(state[1], 2));
+   out_7303340041697938188[56] = -center_to_front*dt*stiffness_front*state[0]/(rotational_inertia*state[1]);
+   out_7303340041697938188[57] = -center_to_front*dt*stiffness_front*state[0]/(rotational_inertia*state[1]);
+   out_7303340041697938188[58] = dt*(-(-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])*state[5]/(rotational_inertia*pow(state[4], 2)) - (-pow(center_to_front, 2)*stiffness_front*state[0] - pow(center_to_rear, 2)*stiffness_rear*state[0])*state[6]/(rotational_inertia*pow(state[4], 2)));
+   out_7303340041697938188[59] = dt*(-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(rotational_inertia*state[4]);
+   out_7303340041697938188[60] = dt*(-pow(center_to_front, 2)*stiffness_front*state[0] - pow(center_to_rear, 2)*stiffness_rear*state[0])/(rotational_inertia*state[4]) + 1;
+   out_7303340041697938188[61] = center_to_front*dt*stiffness_front*state[0]/(rotational_inertia*state[1]);
+   out_7303340041697938188[62] = 0;
+   out_7303340041697938188[63] = 0;
+   out_7303340041697938188[64] = 0;
+   out_7303340041697938188[65] = 0;
+   out_7303340041697938188[66] = 0;
+   out_7303340041697938188[67] = 0;
+   out_7303340041697938188[68] = 0;
+   out_7303340041697938188[69] = 0;
+   out_7303340041697938188[70] = 1;
+   out_7303340041697938188[71] = 0;
+   out_7303340041697938188[72] = 0;
+   out_7303340041697938188[73] = 0;
+   out_7303340041697938188[74] = 0;
+   out_7303340041697938188[75] = 0;
+   out_7303340041697938188[76] = 0;
+   out_7303340041697938188[77] = 0;
+   out_7303340041697938188[78] = 0;
+   out_7303340041697938188[79] = 0;
+   out_7303340041697938188[80] = 1;
 }
-void h_25(double *state, double *unused, double *out_4962192466318968957) {
-   out_4962192466318968957[0] = state[6];
+void h_25(double *state, double *unused, double *out_5588110016210508170) {
+   out_5588110016210508170[0] = state[6];
 }
-void H_25(double *state, double *unused, double *out_279667768067758393) {
-   out_279667768067758393[0] = 0;
-   out_279667768067758393[1] = 0;
-   out_279667768067758393[2] = 0;
-   out_279667768067758393[3] = 0;
-   out_279667768067758393[4] = 0;
-   out_279667768067758393[5] = 0;
-   out_279667768067758393[6] = 1;
-   out_279667768067758393[7] = 0;
-   out_279667768067758393[8] = 0;
+void H_25(double *state, double *unused, double *out_6037113083971364302) {
+   out_6037113083971364302[0] = 0;
+   out_6037113083971364302[1] = 0;
+   out_6037113083971364302[2] = 0;
+   out_6037113083971364302[3] = 0;
+   out_6037113083971364302[4] = 0;
+   out_6037113083971364302[5] = 0;
+   out_6037113083971364302[6] = 1;
+   out_6037113083971364302[7] = 0;
+   out_6037113083971364302[8] = 0;
 }
-void h_24(double *state, double *unused, double *out_8672504443832107776) {
-   out_8672504443832107776[0] = state[4];
-   out_8672504443832107776[1] = state[5];
+void h_24(double *state, double *unused, double *out_4380624216713203670) {
+   out_4380624216713203670[0] = state[4];
+   out_4380624216713203670[1] = state[5];
 }
-void H_24(double *state, double *unused, double *out_1897546655539391580) {
-   out_1897546655539391580[0] = 0;
-   out_1897546655539391580[1] = 0;
-   out_1897546655539391580[2] = 0;
-   out_1897546655539391580[3] = 0;
-   out_1897546655539391580[4] = 1;
-   out_1897546655539391580[5] = 0;
-   out_1897546655539391580[6] = 0;
-   out_1897546655539391580[7] = 0;
-   out_1897546655539391580[8] = 0;
-   out_1897546655539391580[9] = 0;
-   out_1897546655539391580[10] = 0;
-   out_1897546655539391580[11] = 0;
-   out_1897546655539391580[12] = 0;
-   out_1897546655539391580[13] = 0;
-   out_1897546655539391580[14] = 1;
-   out_1897546655539391580[15] = 0;
-   out_1897546655539391580[16] = 0;
-   out_1897546655539391580[17] = 0;
+void H_24(double *state, double *unused, double *out_8209762682976863868) {
+   out_8209762682976863868[0] = 0;
+   out_8209762682976863868[1] = 0;
+   out_8209762682976863868[2] = 0;
+   out_8209762682976863868[3] = 0;
+   out_8209762682976863868[4] = 1;
+   out_8209762682976863868[5] = 0;
+   out_8209762682976863868[6] = 0;
+   out_8209762682976863868[7] = 0;
+   out_8209762682976863868[8] = 0;
+   out_8209762682976863868[9] = 0;
+   out_8209762682976863868[10] = 0;
+   out_8209762682976863868[11] = 0;
+   out_8209762682976863868[12] = 0;
+   out_8209762682976863868[13] = 0;
+   out_8209762682976863868[14] = 1;
+   out_8209762682976863868[15] = 0;
+   out_8209762682976863868[16] = 0;
+   out_8209762682976863868[17] = 0;
 }
-void h_30(double *state, double *unused, double *out_4360774308705605403) {
-   out_4360774308705605403[0] = state[4];
+void h_30(double *state, double *unused, double *out_4965694562614520087) {
+   out_4965694562614520087[0] = state[4];
 }
-void H_30(double *state, double *unused, double *out_2238665190439490234) {
-   out_2238665190439490234[0] = 0;
-   out_2238665190439490234[1] = 0;
-   out_2238665190439490234[2] = 0;
-   out_2238665190439490234[3] = 0;
-   out_2238665190439490234[4] = 1;
-   out_2238665190439490234[5] = 0;
-   out_2238665190439490234[6] = 0;
-   out_2238665190439490234[7] = 0;
-   out_2238665190439490234[8] = 0;
+void H_30(double *state, double *unused, double *out_879577257520252453) {
+   out_879577257520252453[0] = 0;
+   out_879577257520252453[1] = 0;
+   out_879577257520252453[2] = 0;
+   out_879577257520252453[3] = 0;
+   out_879577257520252453[4] = 1;
+   out_879577257520252453[5] = 0;
+   out_879577257520252453[6] = 0;
+   out_879577257520252453[7] = 0;
+   out_879577257520252453[8] = 0;
 }
-void h_26(double *state, double *unused, double *out_640898958955240242) {
-   out_640898958955240242[0] = state[7];
+void h_26(double *state, double *unused, double *out_4499080339088190764) {
+   out_4499080339088190764[0] = state[7];
 }
-void H_26(double *state, double *unused, double *out_4021171086941814617) {
-   out_4021171086941814617[0] = 0;
-   out_4021171086941814617[1] = 0;
-   out_4021171086941814617[2] = 0;
-   out_4021171086941814617[3] = 0;
-   out_4021171086941814617[4] = 0;
-   out_4021171086941814617[5] = 0;
-   out_4021171086941814617[6] = 0;
-   out_4021171086941814617[7] = 1;
-   out_4021171086941814617[8] = 0;
+void H_26(double *state, double *unused, double *out_8668127670864131090) {
+   out_8668127670864131090[0] = 0;
+   out_8668127670864131090[1] = 0;
+   out_8668127670864131090[2] = 0;
+   out_8668127670864131090[3] = 0;
+   out_8668127670864131090[4] = 0;
+   out_8668127670864131090[5] = 0;
+   out_8668127670864131090[6] = 0;
+   out_8668127670864131090[7] = 1;
+   out_8668127670864131090[8] = 0;
 }
-void h_27(double *state, double *unused, double *out_3142070393519437079) {
-   out_3142070393519437079[0] = state[3];
+void h_27(double *state, double *unused, double *out_586436748549662525) {
+   out_586436748549662525[0] = state[3];
 }
-void H_27(double *state, double *unused, double *out_4462259261623433451) {
-   out_4462259261623433451[0] = 0;
-   out_4462259261623433451[1] = 0;
-   out_4462259261623433451[2] = 0;
-   out_4462259261623433451[3] = 1;
-   out_4462259261623433451[4] = 0;
-   out_4462259261623433451[5] = 0;
-   out_4462259261623433451[6] = 0;
-   out_4462259261623433451[7] = 0;
-   out_4462259261623433451[8] = 0;
+void H_27(double *state, double *unused, double *out_1295186054280172458) {
+   out_1295186054280172458[0] = 0;
+   out_1295186054280172458[1] = 0;
+   out_1295186054280172458[2] = 0;
+   out_1295186054280172458[3] = 1;
+   out_1295186054280172458[4] = 0;
+   out_1295186054280172458[5] = 0;
+   out_1295186054280172458[6] = 0;
+   out_1295186054280172458[7] = 0;
+   out_1295186054280172458[8] = 0;
 }
-void h_29(double *state, double *unused, double *out_4621194863301235362) {
-   out_4621194863301235362[0] = state[1];
+void h_29(double *state, double *unused, double *out_5569010447290997604) {
+   out_5569010447290997604[0] = state[1];
 }
-void H_29(double *state, double *unused, double *out_2748896534753882418) {
-   out_2748896534753882418[0] = 0;
-   out_2748896534753882418[1] = 1;
-   out_2748896534753882418[2] = 0;
-   out_2748896534753882418[3] = 0;
-   out_2748896534753882418[4] = 0;
-   out_2748896534753882418[5] = 0;
-   out_2748896534753882418[6] = 0;
-   out_2748896534753882418[7] = 0;
-   out_2748896534753882418[8] = 0;
+void H_29(double *state, double *unused, double *out_3008548781149723491) {
+   out_3008548781149723491[0] = 0;
+   out_3008548781149723491[1] = 1;
+   out_3008548781149723491[2] = 0;
+   out_3008548781149723491[3] = 0;
+   out_3008548781149723491[4] = 0;
+   out_3008548781149723491[5] = 0;
+   out_3008548781149723491[6] = 0;
+   out_3008548781149723491[7] = 0;
+   out_3008548781149723491[8] = 0;
 }
-void h_28(double *state, double *unused, double *out_7655328506878780195) {
-   out_7655328506878780195[0] = state[0];
+void h_28(double *state, double *unused, double *out_2689411064197794064) {
+   out_2689411064197794064[0] = state[0];
 }
-void H_28(double *state, double *unused, double *out_2333502482315648156) {
-   out_2333502482315648156[0] = 1;
-   out_2333502482315648156[1] = 0;
-   out_2333502482315648156[2] = 0;
-   out_2333502482315648156[3] = 0;
-   out_2333502482315648156[4] = 0;
-   out_2333502482315648156[5] = 0;
-   out_2333502482315648156[6] = 0;
-   out_2333502482315648156[7] = 0;
-   out_2333502482315648156[8] = 0;
+void H_28(double *state, double *unused, double *out_8090947798219254065) {
+   out_8090947798219254065[0] = 1;
+   out_8090947798219254065[1] = 0;
+   out_8090947798219254065[2] = 0;
+   out_8090947798219254065[3] = 0;
+   out_8090947798219254065[4] = 0;
+   out_8090947798219254065[5] = 0;
+   out_8090947798219254065[6] = 0;
+   out_8090947798219254065[7] = 0;
+   out_8090947798219254065[8] = 0;
 }
-void h_31(double *state, double *unused, double *out_5721286350569910218) {
-   out_5721286350569910218[0] = state[8];
+void h_31(double *state, double *unused, double *out_5863304078495014059) {
+   out_5863304078495014059[0] = state[8];
 }
-void H_31(double *state, double *unused, double *out_249021806190797965) {
-   out_249021806190797965[0] = 0;
-   out_249021806190797965[1] = 0;
-   out_249021806190797965[2] = 0;
-   out_249021806190797965[3] = 0;
-   out_249021806190797965[4] = 0;
-   out_249021806190797965[5] = 0;
-   out_249021806190797965[6] = 0;
-   out_249021806190797965[7] = 0;
-   out_249021806190797965[8] = 1;
+void H_31(double *state, double *unused, double *out_6006467122094403874) {
+   out_6006467122094403874[0] = 0;
+   out_6006467122094403874[1] = 0;
+   out_6006467122094403874[2] = 0;
+   out_6006467122094403874[3] = 0;
+   out_6006467122094403874[4] = 0;
+   out_6006467122094403874[5] = 0;
+   out_6006467122094403874[6] = 0;
+   out_6006467122094403874[7] = 0;
+   out_6006467122094403874[8] = 1;
 }
 #include <eigen3/Eigen/Dense>
 #include <iostream>
@@ -518,68 +518,68 @@ void car_update_28(double *in_x, double *in_P, double *in_z, double *in_R, doubl
 void car_update_31(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea) {
   update<1, 3, 0>(in_x, in_P, h_31, H_31, NULL, in_z, in_R, in_ea, MAHA_THRESH_31);
 }
-void car_err_fun(double *nom_x, double *delta_x, double *out_8412408275907562510) {
-  err_fun(nom_x, delta_x, out_8412408275907562510);
+void car_err_fun(double *nom_x, double *delta_x, double *out_1282327502940326821) {
+  err_fun(nom_x, delta_x, out_1282327502940326821);
 }
-void car_inv_err_fun(double *nom_x, double *true_x, double *out_5009429012443487067) {
-  inv_err_fun(nom_x, true_x, out_5009429012443487067);
+void car_inv_err_fun(double *nom_x, double *true_x, double *out_4590721196226970281) {
+  inv_err_fun(nom_x, true_x, out_4590721196226970281);
 }
-void car_H_mod_fun(double *state, double *out_7201068384612818103) {
-  H_mod_fun(state, out_7201068384612818103);
+void car_H_mod_fun(double *state, double *out_2163953626510216661) {
+  H_mod_fun(state, out_2163953626510216661);
 }
-void car_f_fun(double *state, double dt, double *out_2117395969407442559) {
-  f_fun(state,  dt, out_2117395969407442559);
+void car_f_fun(double *state, double dt, double *out_405606070335708994) {
+  f_fun(state,  dt, out_405606070335708994);
 }
-void car_F_fun(double *state, double dt, double *out_1930106235119052766) {
-  F_fun(state,  dt, out_1930106235119052766);
+void car_F_fun(double *state, double dt, double *out_7303340041697938188) {
+  F_fun(state,  dt, out_7303340041697938188);
 }
-void car_h_25(double *state, double *unused, double *out_4962192466318968957) {
-  h_25(state, unused, out_4962192466318968957);
+void car_h_25(double *state, double *unused, double *out_5588110016210508170) {
+  h_25(state, unused, out_5588110016210508170);
 }
-void car_H_25(double *state, double *unused, double *out_279667768067758393) {
-  H_25(state, unused, out_279667768067758393);
+void car_H_25(double *state, double *unused, double *out_6037113083971364302) {
+  H_25(state, unused, out_6037113083971364302);
 }
-void car_h_24(double *state, double *unused, double *out_8672504443832107776) {
-  h_24(state, unused, out_8672504443832107776);
+void car_h_24(double *state, double *unused, double *out_4380624216713203670) {
+  h_24(state, unused, out_4380624216713203670);
 }
-void car_H_24(double *state, double *unused, double *out_1897546655539391580) {
-  H_24(state, unused, out_1897546655539391580);
+void car_H_24(double *state, double *unused, double *out_8209762682976863868) {
+  H_24(state, unused, out_8209762682976863868);
 }
-void car_h_30(double *state, double *unused, double *out_4360774308705605403) {
-  h_30(state, unused, out_4360774308705605403);
+void car_h_30(double *state, double *unused, double *out_4965694562614520087) {
+  h_30(state, unused, out_4965694562614520087);
 }
-void car_H_30(double *state, double *unused, double *out_2238665190439490234) {
-  H_30(state, unused, out_2238665190439490234);
+void car_H_30(double *state, double *unused, double *out_879577257520252453) {
+  H_30(state, unused, out_879577257520252453);
 }
-void car_h_26(double *state, double *unused, double *out_640898958955240242) {
-  h_26(state, unused, out_640898958955240242);
+void car_h_26(double *state, double *unused, double *out_4499080339088190764) {
+  h_26(state, unused, out_4499080339088190764);
 }
-void car_H_26(double *state, double *unused, double *out_4021171086941814617) {
-  H_26(state, unused, out_4021171086941814617);
+void car_H_26(double *state, double *unused, double *out_8668127670864131090) {
+  H_26(state, unused, out_8668127670864131090);
 }
-void car_h_27(double *state, double *unused, double *out_3142070393519437079) {
-  h_27(state, unused, out_3142070393519437079);
+void car_h_27(double *state, double *unused, double *out_586436748549662525) {
+  h_27(state, unused, out_586436748549662525);
 }
-void car_H_27(double *state, double *unused, double *out_4462259261623433451) {
-  H_27(state, unused, out_4462259261623433451);
+void car_H_27(double *state, double *unused, double *out_1295186054280172458) {
+  H_27(state, unused, out_1295186054280172458);
 }
-void car_h_29(double *state, double *unused, double *out_4621194863301235362) {
-  h_29(state, unused, out_4621194863301235362);
+void car_h_29(double *state, double *unused, double *out_5569010447290997604) {
+  h_29(state, unused, out_5569010447290997604);
 }
-void car_H_29(double *state, double *unused, double *out_2748896534753882418) {
-  H_29(state, unused, out_2748896534753882418);
+void car_H_29(double *state, double *unused, double *out_3008548781149723491) {
+  H_29(state, unused, out_3008548781149723491);
 }
-void car_h_28(double *state, double *unused, double *out_7655328506878780195) {
-  h_28(state, unused, out_7655328506878780195);
+void car_h_28(double *state, double *unused, double *out_2689411064197794064) {
+  h_28(state, unused, out_2689411064197794064);
 }
-void car_H_28(double *state, double *unused, double *out_2333502482315648156) {
-  H_28(state, unused, out_2333502482315648156);
+void car_H_28(double *state, double *unused, double *out_8090947798219254065) {
+  H_28(state, unused, out_8090947798219254065);
 }
-void car_h_31(double *state, double *unused, double *out_5721286350569910218) {
-  h_31(state, unused, out_5721286350569910218);
+void car_h_31(double *state, double *unused, double *out_5863304078495014059) {
+  h_31(state, unused, out_5863304078495014059);
 }
-void car_H_31(double *state, double *unused, double *out_249021806190797965) {
-  H_31(state, unused, out_249021806190797965);
+void car_H_31(double *state, double *unused, double *out_6006467122094403874) {
+  H_31(state, unused, out_6006467122094403874);
 }
 void car_predict(double *in_x, double *in_P, double *in_Q, double dt) {
   predict(in_x, in_P, in_Q, dt);
diff --git a/selfdrive/locationd/models/generated/car.h b/selfdrive/locationd/models/generated/car.h
index fc8c5ff8c..544df47c4 100644
--- a/selfdrive/locationd/models/generated/car.h
+++ b/selfdrive/locationd/models/generated/car.h
@@ -9,27 +9,27 @@ void car_update_27(double *in_x, double *in_P, double *in_z, double *in_R, doubl
 void car_update_29(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea);
 void car_update_28(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea);
 void car_update_31(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea);
-void car_err_fun(double *nom_x, double *delta_x, double *out_8412408275907562510);
-void car_inv_err_fun(double *nom_x, double *true_x, double *out_5009429012443487067);
-void car_H_mod_fun(double *state, double *out_7201068384612818103);
-void car_f_fun(double *state, double dt, double *out_2117395969407442559);
-void car_F_fun(double *state, double dt, double *out_1930106235119052766);
-void car_h_25(double *state, double *unused, double *out_4962192466318968957);
-void car_H_25(double *state, double *unused, double *out_279667768067758393);
-void car_h_24(double *state, double *unused, double *out_8672504443832107776);
-void car_H_24(double *state, double *unused, double *out_1897546655539391580);
-void car_h_30(double *state, double *unused, double *out_4360774308705605403);
-void car_H_30(double *state, double *unused, double *out_2238665190439490234);
-void car_h_26(double *state, double *unused, double *out_640898958955240242);
-void car_H_26(double *state, double *unused, double *out_4021171086941814617);
-void car_h_27(double *state, double *unused, double *out_3142070393519437079);
-void car_H_27(double *state, double *unused, double *out_4462259261623433451);
-void car_h_29(double *state, double *unused, double *out_4621194863301235362);
-void car_H_29(double *state, double *unused, double *out_2748896534753882418);
-void car_h_28(double *state, double *unused, double *out_7655328506878780195);
-void car_H_28(double *state, double *unused, double *out_2333502482315648156);
-void car_h_31(double *state, double *unused, double *out_5721286350569910218);
-void car_H_31(double *state, double *unused, double *out_249021806190797965);
+void car_err_fun(double *nom_x, double *delta_x, double *out_1282327502940326821);
+void car_inv_err_fun(double *nom_x, double *true_x, double *out_4590721196226970281);
+void car_H_mod_fun(double *state, double *out_2163953626510216661);
+void car_f_fun(double *state, double dt, double *out_405606070335708994);
+void car_F_fun(double *state, double dt, double *out_7303340041697938188);
+void car_h_25(double *state, double *unused, double *out_5588110016210508170);
+void car_H_25(double *state, double *unused, double *out_6037113083971364302);
+void car_h_24(double *state, double *unused, double *out_4380624216713203670);
+void car_H_24(double *state, double *unused, double *out_8209762682976863868);
+void car_h_30(double *state, double *unused, double *out_4965694562614520087);
+void car_H_30(double *state, double *unused, double *out_879577257520252453);
+void car_h_26(double *state, double *unused, double *out_4499080339088190764);
+void car_H_26(double *state, double *unused, double *out_8668127670864131090);
+void car_h_27(double *state, double *unused, double *out_586436748549662525);
+void car_H_27(double *state, double *unused, double *out_1295186054280172458);
+void car_h_29(double *state, double *unused, double *out_5569010447290997604);
+void car_H_29(double *state, double *unused, double *out_3008548781149723491);
+void car_h_28(double *state, double *unused, double *out_2689411064197794064);
+void car_H_28(double *state, double *unused, double *out_8090947798219254065);
+void car_h_31(double *state, double *unused, double *out_5863304078495014059);
+void car_H_31(double *state, double *unused, double *out_6006467122094403874);
 void car_predict(double *in_x, double *in_P, double *in_Q, double dt);
 void car_set_mass(double x);
 void car_set_rotational_inertia(double x);
diff --git a/selfdrive/locationd/models/generated/gnss.cpp b/selfdrive/locationd/models/generated/gnss.cpp
index c2e0f471c..e3df158d1 100644
--- a/selfdrive/locationd/models/generated/gnss.cpp
+++ b/selfdrive/locationd/models/generated/gnss.cpp
@@ -17,354 +17,354 @@ const static double MAHA_THRESH_21 = 3.8414588206941227;
  *                                                                            *
  *                         This file is part of 'ekf'                         *
  ******************************************************************************/
-void err_fun(double *nom_x, double *delta_x, double *out_2067482950567323166) {
-   out_2067482950567323166[0] = delta_x[0] + nom_x[0];
-   out_2067482950567323166[1] = delta_x[1] + nom_x[1];
-   out_2067482950567323166[2] = delta_x[2] + nom_x[2];
-   out_2067482950567323166[3] = delta_x[3] + nom_x[3];
-   out_2067482950567323166[4] = delta_x[4] + nom_x[4];
-   out_2067482950567323166[5] = delta_x[5] + nom_x[5];
-   out_2067482950567323166[6] = delta_x[6] + nom_x[6];
-   out_2067482950567323166[7] = delta_x[7] + nom_x[7];
-   out_2067482950567323166[8] = delta_x[8] + nom_x[8];
-   out_2067482950567323166[9] = delta_x[9] + nom_x[9];
-   out_2067482950567323166[10] = delta_x[10] + nom_x[10];
+void err_fun(double *nom_x, double *delta_x, double *out_5270397344340919402) {
+   out_5270397344340919402[0] = delta_x[0] + nom_x[0];
+   out_5270397344340919402[1] = delta_x[1] + nom_x[1];
+   out_5270397344340919402[2] = delta_x[2] + nom_x[2];
+   out_5270397344340919402[3] = delta_x[3] + nom_x[3];
+   out_5270397344340919402[4] = delta_x[4] + nom_x[4];
+   out_5270397344340919402[5] = delta_x[5] + nom_x[5];
+   out_5270397344340919402[6] = delta_x[6] + nom_x[6];
+   out_5270397344340919402[7] = delta_x[7] + nom_x[7];
+   out_5270397344340919402[8] = delta_x[8] + nom_x[8];
+   out_5270397344340919402[9] = delta_x[9] + nom_x[9];
+   out_5270397344340919402[10] = delta_x[10] + nom_x[10];
 }
-void inv_err_fun(double *nom_x, double *true_x, double *out_2603530649313476471) {
-   out_2603530649313476471[0] = -nom_x[0] + true_x[0];
-   out_2603530649313476471[1] = -nom_x[1] + true_x[1];
-   out_2603530649313476471[2] = -nom_x[2] + true_x[2];
-   out_2603530649313476471[3] = -nom_x[3] + true_x[3];
-   out_2603530649313476471[4] = -nom_x[4] + true_x[4];
-   out_2603530649313476471[5] = -nom_x[5] + true_x[5];
-   out_2603530649313476471[6] = -nom_x[6] + true_x[6];
-   out_2603530649313476471[7] = -nom_x[7] + true_x[7];
-   out_2603530649313476471[8] = -nom_x[8] + true_x[8];
-   out_2603530649313476471[9] = -nom_x[9] + true_x[9];
-   out_2603530649313476471[10] = -nom_x[10] + true_x[10];
+void inv_err_fun(double *nom_x, double *true_x, double *out_1512259161409062554) {
+   out_1512259161409062554[0] = -nom_x[0] + true_x[0];
+   out_1512259161409062554[1] = -nom_x[1] + true_x[1];
+   out_1512259161409062554[2] = -nom_x[2] + true_x[2];
+   out_1512259161409062554[3] = -nom_x[3] + true_x[3];
+   out_1512259161409062554[4] = -nom_x[4] + true_x[4];
+   out_1512259161409062554[5] = -nom_x[5] + true_x[5];
+   out_1512259161409062554[6] = -nom_x[6] + true_x[6];
+   out_1512259161409062554[7] = -nom_x[7] + true_x[7];
+   out_1512259161409062554[8] = -nom_x[8] + true_x[8];
+   out_1512259161409062554[9] = -nom_x[9] + true_x[9];
+   out_1512259161409062554[10] = -nom_x[10] + true_x[10];
 }
-void H_mod_fun(double *state, double *out_5820927568950649229) {
-   out_5820927568950649229[0] = 1.0;
-   out_5820927568950649229[1] = 0;
-   out_5820927568950649229[2] = 0;
-   out_5820927568950649229[3] = 0;
-   out_5820927568950649229[4] = 0;
-   out_5820927568950649229[5] = 0;
-   out_5820927568950649229[6] = 0;
-   out_5820927568950649229[7] = 0;
-   out_5820927568950649229[8] = 0;
-   out_5820927568950649229[9] = 0;
-   out_5820927568950649229[10] = 0;
-   out_5820927568950649229[11] = 0;
-   out_5820927568950649229[12] = 1.0;
-   out_5820927568950649229[13] = 0;
-   out_5820927568950649229[14] = 0;
-   out_5820927568950649229[15] = 0;
-   out_5820927568950649229[16] = 0;
-   out_5820927568950649229[17] = 0;
-   out_5820927568950649229[18] = 0;
-   out_5820927568950649229[19] = 0;
-   out_5820927568950649229[20] = 0;
-   out_5820927568950649229[21] = 0;
-   out_5820927568950649229[22] = 0;
-   out_5820927568950649229[23] = 0;
-   out_5820927568950649229[24] = 1.0;
-   out_5820927568950649229[25] = 0;
-   out_5820927568950649229[26] = 0;
-   out_5820927568950649229[27] = 0;
-   out_5820927568950649229[28] = 0;
-   out_5820927568950649229[29] = 0;
-   out_5820927568950649229[30] = 0;
-   out_5820927568950649229[31] = 0;
-   out_5820927568950649229[32] = 0;
-   out_5820927568950649229[33] = 0;
-   out_5820927568950649229[34] = 0;
-   out_5820927568950649229[35] = 0;
-   out_5820927568950649229[36] = 1.0;
-   out_5820927568950649229[37] = 0;
-   out_5820927568950649229[38] = 0;
-   out_5820927568950649229[39] = 0;
-   out_5820927568950649229[40] = 0;
-   out_5820927568950649229[41] = 0;
-   out_5820927568950649229[42] = 0;
-   out_5820927568950649229[43] = 0;
-   out_5820927568950649229[44] = 0;
-   out_5820927568950649229[45] = 0;
-   out_5820927568950649229[46] = 0;
-   out_5820927568950649229[47] = 0;
-   out_5820927568950649229[48] = 1.0;
-   out_5820927568950649229[49] = 0;
-   out_5820927568950649229[50] = 0;
-   out_5820927568950649229[51] = 0;
-   out_5820927568950649229[52] = 0;
-   out_5820927568950649229[53] = 0;
-   out_5820927568950649229[54] = 0;
-   out_5820927568950649229[55] = 0;
-   out_5820927568950649229[56] = 0;
-   out_5820927568950649229[57] = 0;
-   out_5820927568950649229[58] = 0;
-   out_5820927568950649229[59] = 0;
-   out_5820927568950649229[60] = 1.0;
-   out_5820927568950649229[61] = 0;
-   out_5820927568950649229[62] = 0;
-   out_5820927568950649229[63] = 0;
-   out_5820927568950649229[64] = 0;
-   out_5820927568950649229[65] = 0;
-   out_5820927568950649229[66] = 0;
-   out_5820927568950649229[67] = 0;
-   out_5820927568950649229[68] = 0;
-   out_5820927568950649229[69] = 0;
-   out_5820927568950649229[70] = 0;
-   out_5820927568950649229[71] = 0;
-   out_5820927568950649229[72] = 1.0;
-   out_5820927568950649229[73] = 0;
-   out_5820927568950649229[74] = 0;
-   out_5820927568950649229[75] = 0;
-   out_5820927568950649229[76] = 0;
-   out_5820927568950649229[77] = 0;
-   out_5820927568950649229[78] = 0;
-   out_5820927568950649229[79] = 0;
-   out_5820927568950649229[80] = 0;
-   out_5820927568950649229[81] = 0;
-   out_5820927568950649229[82] = 0;
-   out_5820927568950649229[83] = 0;
-   out_5820927568950649229[84] = 1.0;
-   out_5820927568950649229[85] = 0;
-   out_5820927568950649229[86] = 0;
-   out_5820927568950649229[87] = 0;
-   out_5820927568950649229[88] = 0;
-   out_5820927568950649229[89] = 0;
-   out_5820927568950649229[90] = 0;
-   out_5820927568950649229[91] = 0;
-   out_5820927568950649229[92] = 0;
-   out_5820927568950649229[93] = 0;
-   out_5820927568950649229[94] = 0;
-   out_5820927568950649229[95] = 0;
-   out_5820927568950649229[96] = 1.0;
-   out_5820927568950649229[97] = 0;
-   out_5820927568950649229[98] = 0;
-   out_5820927568950649229[99] = 0;
-   out_5820927568950649229[100] = 0;
-   out_5820927568950649229[101] = 0;
-   out_5820927568950649229[102] = 0;
-   out_5820927568950649229[103] = 0;
-   out_5820927568950649229[104] = 0;
-   out_5820927568950649229[105] = 0;
-   out_5820927568950649229[106] = 0;
-   out_5820927568950649229[107] = 0;
-   out_5820927568950649229[108] = 1.0;
-   out_5820927568950649229[109] = 0;
-   out_5820927568950649229[110] = 0;
-   out_5820927568950649229[111] = 0;
-   out_5820927568950649229[112] = 0;
-   out_5820927568950649229[113] = 0;
-   out_5820927568950649229[114] = 0;
-   out_5820927568950649229[115] = 0;
-   out_5820927568950649229[116] = 0;
-   out_5820927568950649229[117] = 0;
-   out_5820927568950649229[118] = 0;
-   out_5820927568950649229[119] = 0;
-   out_5820927568950649229[120] = 1.0;
+void H_mod_fun(double *state, double *out_8413937430488034064) {
+   out_8413937430488034064[0] = 1.0;
+   out_8413937430488034064[1] = 0;
+   out_8413937430488034064[2] = 0;
+   out_8413937430488034064[3] = 0;
+   out_8413937430488034064[4] = 0;
+   out_8413937430488034064[5] = 0;
+   out_8413937430488034064[6] = 0;
+   out_8413937430488034064[7] = 0;
+   out_8413937430488034064[8] = 0;
+   out_8413937430488034064[9] = 0;
+   out_8413937430488034064[10] = 0;
+   out_8413937430488034064[11] = 0;
+   out_8413937430488034064[12] = 1.0;
+   out_8413937430488034064[13] = 0;
+   out_8413937430488034064[14] = 0;
+   out_8413937430488034064[15] = 0;
+   out_8413937430488034064[16] = 0;
+   out_8413937430488034064[17] = 0;
+   out_8413937430488034064[18] = 0;
+   out_8413937430488034064[19] = 0;
+   out_8413937430488034064[20] = 0;
+   out_8413937430488034064[21] = 0;
+   out_8413937430488034064[22] = 0;
+   out_8413937430488034064[23] = 0;
+   out_8413937430488034064[24] = 1.0;
+   out_8413937430488034064[25] = 0;
+   out_8413937430488034064[26] = 0;
+   out_8413937430488034064[27] = 0;
+   out_8413937430488034064[28] = 0;
+   out_8413937430488034064[29] = 0;
+   out_8413937430488034064[30] = 0;
+   out_8413937430488034064[31] = 0;
+   out_8413937430488034064[32] = 0;
+   out_8413937430488034064[33] = 0;
+   out_8413937430488034064[34] = 0;
+   out_8413937430488034064[35] = 0;
+   out_8413937430488034064[36] = 1.0;
+   out_8413937430488034064[37] = 0;
+   out_8413937430488034064[38] = 0;
+   out_8413937430488034064[39] = 0;
+   out_8413937430488034064[40] = 0;
+   out_8413937430488034064[41] = 0;
+   out_8413937430488034064[42] = 0;
+   out_8413937430488034064[43] = 0;
+   out_8413937430488034064[44] = 0;
+   out_8413937430488034064[45] = 0;
+   out_8413937430488034064[46] = 0;
+   out_8413937430488034064[47] = 0;
+   out_8413937430488034064[48] = 1.0;
+   out_8413937430488034064[49] = 0;
+   out_8413937430488034064[50] = 0;
+   out_8413937430488034064[51] = 0;
+   out_8413937430488034064[52] = 0;
+   out_8413937430488034064[53] = 0;
+   out_8413937430488034064[54] = 0;
+   out_8413937430488034064[55] = 0;
+   out_8413937430488034064[56] = 0;
+   out_8413937430488034064[57] = 0;
+   out_8413937430488034064[58] = 0;
+   out_8413937430488034064[59] = 0;
+   out_8413937430488034064[60] = 1.0;
+   out_8413937430488034064[61] = 0;
+   out_8413937430488034064[62] = 0;
+   out_8413937430488034064[63] = 0;
+   out_8413937430488034064[64] = 0;
+   out_8413937430488034064[65] = 0;
+   out_8413937430488034064[66] = 0;
+   out_8413937430488034064[67] = 0;
+   out_8413937430488034064[68] = 0;
+   out_8413937430488034064[69] = 0;
+   out_8413937430488034064[70] = 0;
+   out_8413937430488034064[71] = 0;
+   out_8413937430488034064[72] = 1.0;
+   out_8413937430488034064[73] = 0;
+   out_8413937430488034064[74] = 0;
+   out_8413937430488034064[75] = 0;
+   out_8413937430488034064[76] = 0;
+   out_8413937430488034064[77] = 0;
+   out_8413937430488034064[78] = 0;
+   out_8413937430488034064[79] = 0;
+   out_8413937430488034064[80] = 0;
+   out_8413937430488034064[81] = 0;
+   out_8413937430488034064[82] = 0;
+   out_8413937430488034064[83] = 0;
+   out_8413937430488034064[84] = 1.0;
+   out_8413937430488034064[85] = 0;
+   out_8413937430488034064[86] = 0;
+   out_8413937430488034064[87] = 0;
+   out_8413937430488034064[88] = 0;
+   out_8413937430488034064[89] = 0;
+   out_8413937430488034064[90] = 0;
+   out_8413937430488034064[91] = 0;
+   out_8413937430488034064[92] = 0;
+   out_8413937430488034064[93] = 0;
+   out_8413937430488034064[94] = 0;
+   out_8413937430488034064[95] = 0;
+   out_8413937430488034064[96] = 1.0;
+   out_8413937430488034064[97] = 0;
+   out_8413937430488034064[98] = 0;
+   out_8413937430488034064[99] = 0;
+   out_8413937430488034064[100] = 0;
+   out_8413937430488034064[101] = 0;
+   out_8413937430488034064[102] = 0;
+   out_8413937430488034064[103] = 0;
+   out_8413937430488034064[104] = 0;
+   out_8413937430488034064[105] = 0;
+   out_8413937430488034064[106] = 0;
+   out_8413937430488034064[107] = 0;
+   out_8413937430488034064[108] = 1.0;
+   out_8413937430488034064[109] = 0;
+   out_8413937430488034064[110] = 0;
+   out_8413937430488034064[111] = 0;
+   out_8413937430488034064[112] = 0;
+   out_8413937430488034064[113] = 0;
+   out_8413937430488034064[114] = 0;
+   out_8413937430488034064[115] = 0;
+   out_8413937430488034064[116] = 0;
+   out_8413937430488034064[117] = 0;
+   out_8413937430488034064[118] = 0;
+   out_8413937430488034064[119] = 0;
+   out_8413937430488034064[120] = 1.0;
 }
-void f_fun(double *state, double dt, double *out_17551380326686977) {
-   out_17551380326686977[0] = dt*state[3] + state[0];
-   out_17551380326686977[1] = dt*state[4] + state[1];
-   out_17551380326686977[2] = dt*state[5] + state[2];
-   out_17551380326686977[3] = state[3];
-   out_17551380326686977[4] = state[4];
-   out_17551380326686977[5] = state[5];
-   out_17551380326686977[6] = dt*state[7] + state[6];
-   out_17551380326686977[7] = dt*state[8] + state[7];
-   out_17551380326686977[8] = state[8];
-   out_17551380326686977[9] = state[9];
-   out_17551380326686977[10] = state[10];
+void f_fun(double *state, double dt, double *out_8044790491496694058) {
+   out_8044790491496694058[0] = dt*state[3] + state[0];
+   out_8044790491496694058[1] = dt*state[4] + state[1];
+   out_8044790491496694058[2] = dt*state[5] + state[2];
+   out_8044790491496694058[3] = state[3];
+   out_8044790491496694058[4] = state[4];
+   out_8044790491496694058[5] = state[5];
+   out_8044790491496694058[6] = dt*state[7] + state[6];
+   out_8044790491496694058[7] = dt*state[8] + state[7];
+   out_8044790491496694058[8] = state[8];
+   out_8044790491496694058[9] = state[9];
+   out_8044790491496694058[10] = state[10];
 }
-void F_fun(double *state, double dt, double *out_414838326010165834) {
-   out_414838326010165834[0] = 1;
-   out_414838326010165834[1] = 0;
-   out_414838326010165834[2] = 0;
-   out_414838326010165834[3] = dt;
-   out_414838326010165834[4] = 0;
-   out_414838326010165834[5] = 0;
-   out_414838326010165834[6] = 0;
-   out_414838326010165834[7] = 0;
-   out_414838326010165834[8] = 0;
-   out_414838326010165834[9] = 0;
-   out_414838326010165834[10] = 0;
-   out_414838326010165834[11] = 0;
-   out_414838326010165834[12] = 1;
-   out_414838326010165834[13] = 0;
-   out_414838326010165834[14] = 0;
-   out_414838326010165834[15] = dt;
-   out_414838326010165834[16] = 0;
-   out_414838326010165834[17] = 0;
-   out_414838326010165834[18] = 0;
-   out_414838326010165834[19] = 0;
-   out_414838326010165834[20] = 0;
-   out_414838326010165834[21] = 0;
-   out_414838326010165834[22] = 0;
-   out_414838326010165834[23] = 0;
-   out_414838326010165834[24] = 1;
-   out_414838326010165834[25] = 0;
-   out_414838326010165834[26] = 0;
-   out_414838326010165834[27] = dt;
-   out_414838326010165834[28] = 0;
-   out_414838326010165834[29] = 0;
-   out_414838326010165834[30] = 0;
-   out_414838326010165834[31] = 0;
-   out_414838326010165834[32] = 0;
-   out_414838326010165834[33] = 0;
-   out_414838326010165834[34] = 0;
-   out_414838326010165834[35] = 0;
-   out_414838326010165834[36] = 1;
-   out_414838326010165834[37] = 0;
-   out_414838326010165834[38] = 0;
-   out_414838326010165834[39] = 0;
-   out_414838326010165834[40] = 0;
-   out_414838326010165834[41] = 0;
-   out_414838326010165834[42] = 0;
-   out_414838326010165834[43] = 0;
-   out_414838326010165834[44] = 0;
-   out_414838326010165834[45] = 0;
-   out_414838326010165834[46] = 0;
-   out_414838326010165834[47] = 0;
-   out_414838326010165834[48] = 1;
-   out_414838326010165834[49] = 0;
-   out_414838326010165834[50] = 0;
-   out_414838326010165834[51] = 0;
-   out_414838326010165834[52] = 0;
-   out_414838326010165834[53] = 0;
-   out_414838326010165834[54] = 0;
-   out_414838326010165834[55] = 0;
-   out_414838326010165834[56] = 0;
-   out_414838326010165834[57] = 0;
-   out_414838326010165834[58] = 0;
-   out_414838326010165834[59] = 0;
-   out_414838326010165834[60] = 1;
-   out_414838326010165834[61] = 0;
-   out_414838326010165834[62] = 0;
-   out_414838326010165834[63] = 0;
-   out_414838326010165834[64] = 0;
-   out_414838326010165834[65] = 0;
-   out_414838326010165834[66] = 0;
-   out_414838326010165834[67] = 0;
-   out_414838326010165834[68] = 0;
-   out_414838326010165834[69] = 0;
-   out_414838326010165834[70] = 0;
-   out_414838326010165834[71] = 0;
-   out_414838326010165834[72] = 1;
-   out_414838326010165834[73] = dt;
-   out_414838326010165834[74] = 0;
-   out_414838326010165834[75] = 0;
-   out_414838326010165834[76] = 0;
-   out_414838326010165834[77] = 0;
-   out_414838326010165834[78] = 0;
-   out_414838326010165834[79] = 0;
-   out_414838326010165834[80] = 0;
-   out_414838326010165834[81] = 0;
-   out_414838326010165834[82] = 0;
-   out_414838326010165834[83] = 0;
-   out_414838326010165834[84] = 1;
-   out_414838326010165834[85] = dt;
-   out_414838326010165834[86] = 0;
-   out_414838326010165834[87] = 0;
-   out_414838326010165834[88] = 0;
-   out_414838326010165834[89] = 0;
-   out_414838326010165834[90] = 0;
-   out_414838326010165834[91] = 0;
-   out_414838326010165834[92] = 0;
-   out_414838326010165834[93] = 0;
-   out_414838326010165834[94] = 0;
-   out_414838326010165834[95] = 0;
-   out_414838326010165834[96] = 1;
-   out_414838326010165834[97] = 0;
-   out_414838326010165834[98] = 0;
-   out_414838326010165834[99] = 0;
-   out_414838326010165834[100] = 0;
-   out_414838326010165834[101] = 0;
-   out_414838326010165834[102] = 0;
-   out_414838326010165834[103] = 0;
-   out_414838326010165834[104] = 0;
-   out_414838326010165834[105] = 0;
-   out_414838326010165834[106] = 0;
-   out_414838326010165834[107] = 0;
-   out_414838326010165834[108] = 1;
-   out_414838326010165834[109] = 0;
-   out_414838326010165834[110] = 0;
-   out_414838326010165834[111] = 0;
-   out_414838326010165834[112] = 0;
-   out_414838326010165834[113] = 0;
-   out_414838326010165834[114] = 0;
-   out_414838326010165834[115] = 0;
-   out_414838326010165834[116] = 0;
-   out_414838326010165834[117] = 0;
-   out_414838326010165834[118] = 0;
-   out_414838326010165834[119] = 0;
-   out_414838326010165834[120] = 1;
+void F_fun(double *state, double dt, double *out_7107643139068643538) {
+   out_7107643139068643538[0] = 1;
+   out_7107643139068643538[1] = 0;
+   out_7107643139068643538[2] = 0;
+   out_7107643139068643538[3] = dt;
+   out_7107643139068643538[4] = 0;
+   out_7107643139068643538[5] = 0;
+   out_7107643139068643538[6] = 0;
+   out_7107643139068643538[7] = 0;
+   out_7107643139068643538[8] = 0;
+   out_7107643139068643538[9] = 0;
+   out_7107643139068643538[10] = 0;
+   out_7107643139068643538[11] = 0;
+   out_7107643139068643538[12] = 1;
+   out_7107643139068643538[13] = 0;
+   out_7107643139068643538[14] = 0;
+   out_7107643139068643538[15] = dt;
+   out_7107643139068643538[16] = 0;
+   out_7107643139068643538[17] = 0;
+   out_7107643139068643538[18] = 0;
+   out_7107643139068643538[19] = 0;
+   out_7107643139068643538[20] = 0;
+   out_7107643139068643538[21] = 0;
+   out_7107643139068643538[22] = 0;
+   out_7107643139068643538[23] = 0;
+   out_7107643139068643538[24] = 1;
+   out_7107643139068643538[25] = 0;
+   out_7107643139068643538[26] = 0;
+   out_7107643139068643538[27] = dt;
+   out_7107643139068643538[28] = 0;
+   out_7107643139068643538[29] = 0;
+   out_7107643139068643538[30] = 0;
+   out_7107643139068643538[31] = 0;
+   out_7107643139068643538[32] = 0;
+   out_7107643139068643538[33] = 0;
+   out_7107643139068643538[34] = 0;
+   out_7107643139068643538[35] = 0;
+   out_7107643139068643538[36] = 1;
+   out_7107643139068643538[37] = 0;
+   out_7107643139068643538[38] = 0;
+   out_7107643139068643538[39] = 0;
+   out_7107643139068643538[40] = 0;
+   out_7107643139068643538[41] = 0;
+   out_7107643139068643538[42] = 0;
+   out_7107643139068643538[43] = 0;
+   out_7107643139068643538[44] = 0;
+   out_7107643139068643538[45] = 0;
+   out_7107643139068643538[46] = 0;
+   out_7107643139068643538[47] = 0;
+   out_7107643139068643538[48] = 1;
+   out_7107643139068643538[49] = 0;
+   out_7107643139068643538[50] = 0;
+   out_7107643139068643538[51] = 0;
+   out_7107643139068643538[52] = 0;
+   out_7107643139068643538[53] = 0;
+   out_7107643139068643538[54] = 0;
+   out_7107643139068643538[55] = 0;
+   out_7107643139068643538[56] = 0;
+   out_7107643139068643538[57] = 0;
+   out_7107643139068643538[58] = 0;
+   out_7107643139068643538[59] = 0;
+   out_7107643139068643538[60] = 1;
+   out_7107643139068643538[61] = 0;
+   out_7107643139068643538[62] = 0;
+   out_7107643139068643538[63] = 0;
+   out_7107643139068643538[64] = 0;
+   out_7107643139068643538[65] = 0;
+   out_7107643139068643538[66] = 0;
+   out_7107643139068643538[67] = 0;
+   out_7107643139068643538[68] = 0;
+   out_7107643139068643538[69] = 0;
+   out_7107643139068643538[70] = 0;
+   out_7107643139068643538[71] = 0;
+   out_7107643139068643538[72] = 1;
+   out_7107643139068643538[73] = dt;
+   out_7107643139068643538[74] = 0;
+   out_7107643139068643538[75] = 0;
+   out_7107643139068643538[76] = 0;
+   out_7107643139068643538[77] = 0;
+   out_7107643139068643538[78] = 0;
+   out_7107643139068643538[79] = 0;
+   out_7107643139068643538[80] = 0;
+   out_7107643139068643538[81] = 0;
+   out_7107643139068643538[82] = 0;
+   out_7107643139068643538[83] = 0;
+   out_7107643139068643538[84] = 1;
+   out_7107643139068643538[85] = dt;
+   out_7107643139068643538[86] = 0;
+   out_7107643139068643538[87] = 0;
+   out_7107643139068643538[88] = 0;
+   out_7107643139068643538[89] = 0;
+   out_7107643139068643538[90] = 0;
+   out_7107643139068643538[91] = 0;
+   out_7107643139068643538[92] = 0;
+   out_7107643139068643538[93] = 0;
+   out_7107643139068643538[94] = 0;
+   out_7107643139068643538[95] = 0;
+   out_7107643139068643538[96] = 1;
+   out_7107643139068643538[97] = 0;
+   out_7107643139068643538[98] = 0;
+   out_7107643139068643538[99] = 0;
+   out_7107643139068643538[100] = 0;
+   out_7107643139068643538[101] = 0;
+   out_7107643139068643538[102] = 0;
+   out_7107643139068643538[103] = 0;
+   out_7107643139068643538[104] = 0;
+   out_7107643139068643538[105] = 0;
+   out_7107643139068643538[106] = 0;
+   out_7107643139068643538[107] = 0;
+   out_7107643139068643538[108] = 1;
+   out_7107643139068643538[109] = 0;
+   out_7107643139068643538[110] = 0;
+   out_7107643139068643538[111] = 0;
+   out_7107643139068643538[112] = 0;
+   out_7107643139068643538[113] = 0;
+   out_7107643139068643538[114] = 0;
+   out_7107643139068643538[115] = 0;
+   out_7107643139068643538[116] = 0;
+   out_7107643139068643538[117] = 0;
+   out_7107643139068643538[118] = 0;
+   out_7107643139068643538[119] = 0;
+   out_7107643139068643538[120] = 1;
 }
-void h_6(double *state, double *sat_pos, double *out_9074704291738973277) {
-   out_9074704291738973277[0] = sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2)) + state[6];
+void h_6(double *state, double *sat_pos, double *out_1014783744438669605) {
+   out_1014783744438669605[0] = sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2)) + state[6];
 }
-void H_6(double *state, double *sat_pos, double *out_8056400913830408537) {
-   out_8056400913830408537[0] = (-sat_pos[0] + state[0])/sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2));
-   out_8056400913830408537[1] = (-sat_pos[1] + state[1])/sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2));
-   out_8056400913830408537[2] = (-sat_pos[2] + state[2])/sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2));
-   out_8056400913830408537[3] = 0;
-   out_8056400913830408537[4] = 0;
-   out_8056400913830408537[5] = 0;
-   out_8056400913830408537[6] = 1;
-   out_8056400913830408537[7] = 0;
-   out_8056400913830408537[8] = 0;
-   out_8056400913830408537[9] = 0;
-   out_8056400913830408537[10] = 0;
+void H_6(double *state, double *sat_pos, double *out_2647892629803094557) {
+   out_2647892629803094557[0] = (-sat_pos[0] + state[0])/sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2));
+   out_2647892629803094557[1] = (-sat_pos[1] + state[1])/sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2));
+   out_2647892629803094557[2] = (-sat_pos[2] + state[2])/sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2));
+   out_2647892629803094557[3] = 0;
+   out_2647892629803094557[4] = 0;
+   out_2647892629803094557[5] = 0;
+   out_2647892629803094557[6] = 1;
+   out_2647892629803094557[7] = 0;
+   out_2647892629803094557[8] = 0;
+   out_2647892629803094557[9] = 0;
+   out_2647892629803094557[10] = 0;
 }
-void h_20(double *state, double *sat_pos, double *out_5771271505288635021) {
-   out_5771271505288635021[0] = sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2)) + sat_pos[3]*state[10] + state[6] + state[9];
+void h_20(double *state, double *sat_pos, double *out_4446463785726682298) {
+   out_4446463785726682298[0] = sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2)) + sat_pos[3]*state[10] + state[6] + state[9];
 }
-void H_20(double *state, double *sat_pos, double *out_5454875328892457956) {
-   out_5454875328892457956[0] = (-sat_pos[0] + state[0])/sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2));
-   out_5454875328892457956[1] = (-sat_pos[1] + state[1])/sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2));
-   out_5454875328892457956[2] = (-sat_pos[2] + state[2])/sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2));
-   out_5454875328892457956[3] = 0;
-   out_5454875328892457956[4] = 0;
-   out_5454875328892457956[5] = 0;
-   out_5454875328892457956[6] = 1;
-   out_5454875328892457956[7] = 0;
-   out_5454875328892457956[8] = 0;
-   out_5454875328892457956[9] = 1;
-   out_5454875328892457956[10] = sat_pos[3];
+void H_20(double *state, double *sat_pos, double *out_2058835805956563056) {
+   out_2058835805956563056[0] = (-sat_pos[0] + state[0])/sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2));
+   out_2058835805956563056[1] = (-sat_pos[1] + state[1])/sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2));
+   out_2058835805956563056[2] = (-sat_pos[2] + state[2])/sqrt(pow(-sat_pos[0] + state[0], 2) + pow(-sat_pos[1] + state[1], 2) + pow(-sat_pos[2] + state[2], 2));
+   out_2058835805956563056[3] = 0;
+   out_2058835805956563056[4] = 0;
+   out_2058835805956563056[5] = 0;
+   out_2058835805956563056[6] = 1;
+   out_2058835805956563056[7] = 0;
+   out_2058835805956563056[8] = 0;
+   out_2058835805956563056[9] = 1;
+   out_2058835805956563056[10] = sat_pos[3];
 }
-void h_7(double *state, double *sat_pos_vel, double *out_5412429359018771727) {
-   out_5412429359018771727[0] = (sat_pos_vel[0] - state[0])*(sat_pos_vel[3] - state[3])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2)) + (sat_pos_vel[1] - state[1])*(sat_pos_vel[4] - state[4])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2)) + (sat_pos_vel[2] - state[2])*(sat_pos_vel[5] - state[5])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2)) + state[7];
+void h_7(double *state, double *sat_pos_vel, double *out_6977013047509885177) {
+   out_6977013047509885177[0] = (sat_pos_vel[0] - state[0])*(sat_pos_vel[3] - state[3])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2)) + (sat_pos_vel[1] - state[1])*(sat_pos_vel[4] - state[4])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2)) + (sat_pos_vel[2] - state[2])*(sat_pos_vel[5] - state[5])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2)) + state[7];
 }
-void H_7(double *state, double *sat_pos_vel, double *out_1987528380465191465) {
-   out_1987528380465191465[0] = pow(sat_pos_vel[0] - state[0], 2)*(sat_pos_vel[3] - state[3])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[0] - state[0])*(sat_pos_vel[1] - state[1])*(sat_pos_vel[4] - state[4])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[0] - state[0])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[5] - state[5])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) - (sat_pos_vel[3] - state[3])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
-   out_1987528380465191465[1] = (sat_pos_vel[0] - state[0])*(sat_pos_vel[1] - state[1])*(sat_pos_vel[3] - state[3])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + pow(sat_pos_vel[1] - state[1], 2)*(sat_pos_vel[4] - state[4])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[1] - state[1])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[5] - state[5])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) - (sat_pos_vel[4] - state[4])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
-   out_1987528380465191465[2] = (sat_pos_vel[0] - state[0])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[3] - state[3])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[1] - state[1])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[4] - state[4])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + pow(sat_pos_vel[2] - state[2], 2)*(sat_pos_vel[5] - state[5])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) - (sat_pos_vel[5] - state[5])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
-   out_1987528380465191465[3] = -(sat_pos_vel[0] - state[0])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
-   out_1987528380465191465[4] = -(sat_pos_vel[1] - state[1])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
-   out_1987528380465191465[5] = -(sat_pos_vel[2] - state[2])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
-   out_1987528380465191465[6] = 0;
-   out_1987528380465191465[7] = 1;
-   out_1987528380465191465[8] = 0;
-   out_1987528380465191465[9] = 0;
-   out_1987528380465191465[10] = 0;
+void H_7(double *state, double *sat_pos_vel, double *out_3396370189700754510) {
+   out_3396370189700754510[0] = pow(sat_pos_vel[0] - state[0], 2)*(sat_pos_vel[3] - state[3])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[0] - state[0])*(sat_pos_vel[1] - state[1])*(sat_pos_vel[4] - state[4])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[0] - state[0])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[5] - state[5])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) - (sat_pos_vel[3] - state[3])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
+   out_3396370189700754510[1] = (sat_pos_vel[0] - state[0])*(sat_pos_vel[1] - state[1])*(sat_pos_vel[3] - state[3])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + pow(sat_pos_vel[1] - state[1], 2)*(sat_pos_vel[4] - state[4])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[1] - state[1])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[5] - state[5])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) - (sat_pos_vel[4] - state[4])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
+   out_3396370189700754510[2] = (sat_pos_vel[0] - state[0])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[3] - state[3])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[1] - state[1])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[4] - state[4])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + pow(sat_pos_vel[2] - state[2], 2)*(sat_pos_vel[5] - state[5])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) - (sat_pos_vel[5] - state[5])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
+   out_3396370189700754510[3] = -(sat_pos_vel[0] - state[0])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
+   out_3396370189700754510[4] = -(sat_pos_vel[1] - state[1])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
+   out_3396370189700754510[5] = -(sat_pos_vel[2] - state[2])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
+   out_3396370189700754510[6] = 0;
+   out_3396370189700754510[7] = 1;
+   out_3396370189700754510[8] = 0;
+   out_3396370189700754510[9] = 0;
+   out_3396370189700754510[10] = 0;
 }
-void h_21(double *state, double *sat_pos_vel, double *out_5412429359018771727) {
-   out_5412429359018771727[0] = (sat_pos_vel[0] - state[0])*(sat_pos_vel[3] - state[3])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2)) + (sat_pos_vel[1] - state[1])*(sat_pos_vel[4] - state[4])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2)) + (sat_pos_vel[2] - state[2])*(sat_pos_vel[5] - state[5])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2)) + state[7];
+void h_21(double *state, double *sat_pos_vel, double *out_6977013047509885177) {
+   out_6977013047509885177[0] = (sat_pos_vel[0] - state[0])*(sat_pos_vel[3] - state[3])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2)) + (sat_pos_vel[1] - state[1])*(sat_pos_vel[4] - state[4])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2)) + (sat_pos_vel[2] - state[2])*(sat_pos_vel[5] - state[5])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2)) + state[7];
 }
-void H_21(double *state, double *sat_pos_vel, double *out_1987528380465191465) {
-   out_1987528380465191465[0] = pow(sat_pos_vel[0] - state[0], 2)*(sat_pos_vel[3] - state[3])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[0] - state[0])*(sat_pos_vel[1] - state[1])*(sat_pos_vel[4] - state[4])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[0] - state[0])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[5] - state[5])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) - (sat_pos_vel[3] - state[3])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
-   out_1987528380465191465[1] = (sat_pos_vel[0] - state[0])*(sat_pos_vel[1] - state[1])*(sat_pos_vel[3] - state[3])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + pow(sat_pos_vel[1] - state[1], 2)*(sat_pos_vel[4] - state[4])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[1] - state[1])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[5] - state[5])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) - (sat_pos_vel[4] - state[4])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
-   out_1987528380465191465[2] = (sat_pos_vel[0] - state[0])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[3] - state[3])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[1] - state[1])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[4] - state[4])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + pow(sat_pos_vel[2] - state[2], 2)*(sat_pos_vel[5] - state[5])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) - (sat_pos_vel[5] - state[5])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
-   out_1987528380465191465[3] = -(sat_pos_vel[0] - state[0])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
-   out_1987528380465191465[4] = -(sat_pos_vel[1] - state[1])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
-   out_1987528380465191465[5] = -(sat_pos_vel[2] - state[2])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
-   out_1987528380465191465[6] = 0;
-   out_1987528380465191465[7] = 1;
-   out_1987528380465191465[8] = 0;
-   out_1987528380465191465[9] = 0;
-   out_1987528380465191465[10] = 0;
+void H_21(double *state, double *sat_pos_vel, double *out_3396370189700754510) {
+   out_3396370189700754510[0] = pow(sat_pos_vel[0] - state[0], 2)*(sat_pos_vel[3] - state[3])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[0] - state[0])*(sat_pos_vel[1] - state[1])*(sat_pos_vel[4] - state[4])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[0] - state[0])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[5] - state[5])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) - (sat_pos_vel[3] - state[3])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
+   out_3396370189700754510[1] = (sat_pos_vel[0] - state[0])*(sat_pos_vel[1] - state[1])*(sat_pos_vel[3] - state[3])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + pow(sat_pos_vel[1] - state[1], 2)*(sat_pos_vel[4] - state[4])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[1] - state[1])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[5] - state[5])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) - (sat_pos_vel[4] - state[4])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
+   out_3396370189700754510[2] = (sat_pos_vel[0] - state[0])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[3] - state[3])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + (sat_pos_vel[1] - state[1])*(sat_pos_vel[2] - state[2])*(sat_pos_vel[4] - state[4])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) + pow(sat_pos_vel[2] - state[2], 2)*(sat_pos_vel[5] - state[5])/pow(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2), 3.0/2.0) - (sat_pos_vel[5] - state[5])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
+   out_3396370189700754510[3] = -(sat_pos_vel[0] - state[0])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
+   out_3396370189700754510[4] = -(sat_pos_vel[1] - state[1])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
+   out_3396370189700754510[5] = -(sat_pos_vel[2] - state[2])/sqrt(pow(sat_pos_vel[0] - state[0], 2) + pow(sat_pos_vel[1] - state[1], 2) + pow(sat_pos_vel[2] - state[2], 2));
+   out_3396370189700754510[6] = 0;
+   out_3396370189700754510[7] = 1;
+   out_3396370189700754510[8] = 0;
+   out_3396370189700754510[9] = 0;
+   out_3396370189700754510[10] = 0;
 }
 #include <eigen3/Eigen/Dense>
 #include <iostream>
@@ -506,44 +506,44 @@ void gnss_update_7(double *in_x, double *in_P, double *in_z, double *in_R, doubl
 void gnss_update_21(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea) {
   update<1, 3, 0>(in_x, in_P, h_21, H_21, NULL, in_z, in_R, in_ea, MAHA_THRESH_21);
 }
-void gnss_err_fun(double *nom_x, double *delta_x, double *out_2067482950567323166) {
-  err_fun(nom_x, delta_x, out_2067482950567323166);
+void gnss_err_fun(double *nom_x, double *delta_x, double *out_5270397344340919402) {
+  err_fun(nom_x, delta_x, out_5270397344340919402);
 }
-void gnss_inv_err_fun(double *nom_x, double *true_x, double *out_2603530649313476471) {
-  inv_err_fun(nom_x, true_x, out_2603530649313476471);
+void gnss_inv_err_fun(double *nom_x, double *true_x, double *out_1512259161409062554) {
+  inv_err_fun(nom_x, true_x, out_1512259161409062554);
 }
-void gnss_H_mod_fun(double *state, double *out_5820927568950649229) {
-  H_mod_fun(state, out_5820927568950649229);
+void gnss_H_mod_fun(double *state, double *out_8413937430488034064) {
+  H_mod_fun(state, out_8413937430488034064);
 }
-void gnss_f_fun(double *state, double dt, double *out_17551380326686977) {
-  f_fun(state,  dt, out_17551380326686977);
+void gnss_f_fun(double *state, double dt, double *out_8044790491496694058) {
+  f_fun(state,  dt, out_8044790491496694058);
 }
-void gnss_F_fun(double *state, double dt, double *out_414838326010165834) {
-  F_fun(state,  dt, out_414838326010165834);
+void gnss_F_fun(double *state, double dt, double *out_7107643139068643538) {
+  F_fun(state,  dt, out_7107643139068643538);
 }
-void gnss_h_6(double *state, double *sat_pos, double *out_9074704291738973277) {
-  h_6(state, sat_pos, out_9074704291738973277);
+void gnss_h_6(double *state, double *sat_pos, double *out_1014783744438669605) {
+  h_6(state, sat_pos, out_1014783744438669605);
 }
-void gnss_H_6(double *state, double *sat_pos, double *out_8056400913830408537) {
-  H_6(state, sat_pos, out_8056400913830408537);
+void gnss_H_6(double *state, double *sat_pos, double *out_2647892629803094557) {
+  H_6(state, sat_pos, out_2647892629803094557);
 }
-void gnss_h_20(double *state, double *sat_pos, double *out_5771271505288635021) {
-  h_20(state, sat_pos, out_5771271505288635021);
+void gnss_h_20(double *state, double *sat_pos, double *out_4446463785726682298) {
+  h_20(state, sat_pos, out_4446463785726682298);
 }
-void gnss_H_20(double *state, double *sat_pos, double *out_5454875328892457956) {
-  H_20(state, sat_pos, out_5454875328892457956);
+void gnss_H_20(double *state, double *sat_pos, double *out_2058835805956563056) {
+  H_20(state, sat_pos, out_2058835805956563056);
 }
-void gnss_h_7(double *state, double *sat_pos_vel, double *out_5412429359018771727) {
-  h_7(state, sat_pos_vel, out_5412429359018771727);
+void gnss_h_7(double *state, double *sat_pos_vel, double *out_6977013047509885177) {
+  h_7(state, sat_pos_vel, out_6977013047509885177);
 }
-void gnss_H_7(double *state, double *sat_pos_vel, double *out_1987528380465191465) {
-  H_7(state, sat_pos_vel, out_1987528380465191465);
+void gnss_H_7(double *state, double *sat_pos_vel, double *out_3396370189700754510) {
+  H_7(state, sat_pos_vel, out_3396370189700754510);
 }
-void gnss_h_21(double *state, double *sat_pos_vel, double *out_5412429359018771727) {
-  h_21(state, sat_pos_vel, out_5412429359018771727);
+void gnss_h_21(double *state, double *sat_pos_vel, double *out_6977013047509885177) {
+  h_21(state, sat_pos_vel, out_6977013047509885177);
 }
-void gnss_H_21(double *state, double *sat_pos_vel, double *out_1987528380465191465) {
-  H_21(state, sat_pos_vel, out_1987528380465191465);
+void gnss_H_21(double *state, double *sat_pos_vel, double *out_3396370189700754510) {
+  H_21(state, sat_pos_vel, out_3396370189700754510);
 }
 void gnss_predict(double *in_x, double *in_P, double *in_Q, double dt) {
   predict(in_x, in_P, in_Q, dt);
diff --git a/selfdrive/locationd/models/generated/gnss.h b/selfdrive/locationd/models/generated/gnss.h
index 75c2d401d..d55128308 100644
--- a/selfdrive/locationd/models/generated/gnss.h
+++ b/selfdrive/locationd/models/generated/gnss.h
@@ -5,18 +5,18 @@ void gnss_update_6(double *in_x, double *in_P, double *in_z, double *in_R, doubl
 void gnss_update_20(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea);
 void gnss_update_7(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea);
 void gnss_update_21(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea);
-void gnss_err_fun(double *nom_x, double *delta_x, double *out_2067482950567323166);
-void gnss_inv_err_fun(double *nom_x, double *true_x, double *out_2603530649313476471);
-void gnss_H_mod_fun(double *state, double *out_5820927568950649229);
-void gnss_f_fun(double *state, double dt, double *out_17551380326686977);
-void gnss_F_fun(double *state, double dt, double *out_414838326010165834);
-void gnss_h_6(double *state, double *sat_pos, double *out_9074704291738973277);
-void gnss_H_6(double *state, double *sat_pos, double *out_8056400913830408537);
-void gnss_h_20(double *state, double *sat_pos, double *out_5771271505288635021);
-void gnss_H_20(double *state, double *sat_pos, double *out_5454875328892457956);
-void gnss_h_7(double *state, double *sat_pos_vel, double *out_5412429359018771727);
-void gnss_H_7(double *state, double *sat_pos_vel, double *out_1987528380465191465);
-void gnss_h_21(double *state, double *sat_pos_vel, double *out_5412429359018771727);
-void gnss_H_21(double *state, double *sat_pos_vel, double *out_1987528380465191465);
+void gnss_err_fun(double *nom_x, double *delta_x, double *out_5270397344340919402);
+void gnss_inv_err_fun(double *nom_x, double *true_x, double *out_1512259161409062554);
+void gnss_H_mod_fun(double *state, double *out_8413937430488034064);
+void gnss_f_fun(double *state, double dt, double *out_8044790491496694058);
+void gnss_F_fun(double *state, double dt, double *out_7107643139068643538);
+void gnss_h_6(double *state, double *sat_pos, double *out_1014783744438669605);
+void gnss_H_6(double *state, double *sat_pos, double *out_2647892629803094557);
+void gnss_h_20(double *state, double *sat_pos, double *out_4446463785726682298);
+void gnss_H_20(double *state, double *sat_pos, double *out_2058835805956563056);
+void gnss_h_7(double *state, double *sat_pos_vel, double *out_6977013047509885177);
+void gnss_H_7(double *state, double *sat_pos_vel, double *out_3396370189700754510);
+void gnss_h_21(double *state, double *sat_pos_vel, double *out_6977013047509885177);
+void gnss_H_21(double *state, double *sat_pos_vel, double *out_3396370189700754510);
 void gnss_predict(double *in_x, double *in_P, double *in_Q, double dt);
 }
\ No newline at end of file
diff --git a/selfdrive/locationd/models/generated/libkf.so b/selfdrive/locationd/models/generated/libkf.so
index 5ab75d707..39270f700 100755
Binary files a/selfdrive/locationd/models/generated/libkf.so and b/selfdrive/locationd/models/generated/libkf.so differ
diff --git a/selfdrive/locationd/models/generated/live.cpp b/selfdrive/locationd/models/generated/live.cpp
index fffcb61a4..36d1574d6 100644
--- a/selfdrive/locationd/models/generated/live.cpp
+++ b/selfdrive/locationd/models/generated/live.cpp
@@ -22,1683 +22,1683 @@ const static double MAHA_THRESH_33 = 7.814727903251177;
  *                                                                            *
  *                         This file is part of 'ekf'                         *
  ******************************************************************************/
-void H(double *in_vec, double *out_3981994659674141472) {
-   out_3981994659674141472[0] = 0;
-   out_3981994659674141472[1] = -sin(in_vec[1])*sin(in_vec[2])*in_vec[4] - sin(in_vec[1])*cos(in_vec[2])*in_vec[3] - cos(in_vec[1])*in_vec[5];
-   out_3981994659674141472[2] = -sin(in_vec[2])*cos(in_vec[1])*in_vec[3] + cos(in_vec[1])*cos(in_vec[2])*in_vec[4];
-   out_3981994659674141472[3] = cos(in_vec[1])*cos(in_vec[2]);
-   out_3981994659674141472[4] = sin(in_vec[2])*cos(in_vec[1]);
-   out_3981994659674141472[5] = -sin(in_vec[1]);
-   out_3981994659674141472[6] = (sin(in_vec[0])*sin(in_vec[2]) + sin(in_vec[1])*cos(in_vec[0])*cos(in_vec[2]))*in_vec[3] + (-sin(in_vec[0])*cos(in_vec[2]) + sin(in_vec[1])*sin(in_vec[2])*cos(in_vec[0]))*in_vec[4] + cos(in_vec[0])*cos(in_vec[1])*in_vec[5];
-   out_3981994659674141472[7] = -sin(in_vec[0])*sin(in_vec[1])*in_vec[5] + sin(in_vec[0])*sin(in_vec[2])*cos(in_vec[1])*in_vec[4] + sin(in_vec[0])*cos(in_vec[1])*cos(in_vec[2])*in_vec[3];
-   out_3981994659674141472[8] = (-sin(in_vec[0])*sin(in_vec[1])*sin(in_vec[2]) - cos(in_vec[0])*cos(in_vec[2]))*in_vec[3] + (sin(in_vec[0])*sin(in_vec[1])*cos(in_vec[2]) - sin(in_vec[2])*cos(in_vec[0]))*in_vec[4];
-   out_3981994659674141472[9] = sin(in_vec[0])*sin(in_vec[1])*cos(in_vec[2]) - sin(in_vec[2])*cos(in_vec[0]);
-   out_3981994659674141472[10] = sin(in_vec[0])*sin(in_vec[1])*sin(in_vec[2]) + cos(in_vec[0])*cos(in_vec[2]);
-   out_3981994659674141472[11] = sin(in_vec[0])*cos(in_vec[1]);
-   out_3981994659674141472[12] = (-sin(in_vec[0])*sin(in_vec[1])*sin(in_vec[2]) - cos(in_vec[0])*cos(in_vec[2]))*in_vec[4] + (-sin(in_vec[0])*sin(in_vec[1])*cos(in_vec[2]) + sin(in_vec[2])*cos(in_vec[0]))*in_vec[3] - sin(in_vec[0])*cos(in_vec[1])*in_vec[5];
-   out_3981994659674141472[13] = -sin(in_vec[1])*cos(in_vec[0])*in_vec[5] + sin(in_vec[2])*cos(in_vec[0])*cos(in_vec[1])*in_vec[4] + cos(in_vec[0])*cos(in_vec[1])*cos(in_vec[2])*in_vec[3];
-   out_3981994659674141472[14] = (sin(in_vec[0])*sin(in_vec[2]) + sin(in_vec[1])*cos(in_vec[0])*cos(in_vec[2]))*in_vec[4] + (sin(in_vec[0])*cos(in_vec[2]) - sin(in_vec[1])*sin(in_vec[2])*cos(in_vec[0]))*in_vec[3];
-   out_3981994659674141472[15] = sin(in_vec[0])*sin(in_vec[2]) + sin(in_vec[1])*cos(in_vec[0])*cos(in_vec[2]);
-   out_3981994659674141472[16] = -sin(in_vec[0])*cos(in_vec[2]) + sin(in_vec[1])*sin(in_vec[2])*cos(in_vec[0]);
-   out_3981994659674141472[17] = cos(in_vec[0])*cos(in_vec[1]);
+void H(double *in_vec, double *out_2107061543090158966) {
+   out_2107061543090158966[0] = 0;
+   out_2107061543090158966[1] = -sin(in_vec[1])*sin(in_vec[2])*in_vec[4] - sin(in_vec[1])*cos(in_vec[2])*in_vec[3] - cos(in_vec[1])*in_vec[5];
+   out_2107061543090158966[2] = -sin(in_vec[2])*cos(in_vec[1])*in_vec[3] + cos(in_vec[1])*cos(in_vec[2])*in_vec[4];
+   out_2107061543090158966[3] = cos(in_vec[1])*cos(in_vec[2]);
+   out_2107061543090158966[4] = sin(in_vec[2])*cos(in_vec[1]);
+   out_2107061543090158966[5] = -sin(in_vec[1]);
+   out_2107061543090158966[6] = (sin(in_vec[0])*sin(in_vec[2]) + sin(in_vec[1])*cos(in_vec[0])*cos(in_vec[2]))*in_vec[3] + (-sin(in_vec[0])*cos(in_vec[2]) + sin(in_vec[1])*sin(in_vec[2])*cos(in_vec[0]))*in_vec[4] + cos(in_vec[0])*cos(in_vec[1])*in_vec[5];
+   out_2107061543090158966[7] = -sin(in_vec[0])*sin(in_vec[1])*in_vec[5] + sin(in_vec[0])*sin(in_vec[2])*cos(in_vec[1])*in_vec[4] + sin(in_vec[0])*cos(in_vec[1])*cos(in_vec[2])*in_vec[3];
+   out_2107061543090158966[8] = (-sin(in_vec[0])*sin(in_vec[1])*sin(in_vec[2]) - cos(in_vec[0])*cos(in_vec[2]))*in_vec[3] + (sin(in_vec[0])*sin(in_vec[1])*cos(in_vec[2]) - sin(in_vec[2])*cos(in_vec[0]))*in_vec[4];
+   out_2107061543090158966[9] = sin(in_vec[0])*sin(in_vec[1])*cos(in_vec[2]) - sin(in_vec[2])*cos(in_vec[0]);
+   out_2107061543090158966[10] = sin(in_vec[0])*sin(in_vec[1])*sin(in_vec[2]) + cos(in_vec[0])*cos(in_vec[2]);
+   out_2107061543090158966[11] = sin(in_vec[0])*cos(in_vec[1]);
+   out_2107061543090158966[12] = (-sin(in_vec[0])*sin(in_vec[1])*sin(in_vec[2]) - cos(in_vec[0])*cos(in_vec[2]))*in_vec[4] + (-sin(in_vec[0])*sin(in_vec[1])*cos(in_vec[2]) + sin(in_vec[2])*cos(in_vec[0]))*in_vec[3] - sin(in_vec[0])*cos(in_vec[1])*in_vec[5];
+   out_2107061543090158966[13] = -sin(in_vec[1])*cos(in_vec[0])*in_vec[5] + sin(in_vec[2])*cos(in_vec[0])*cos(in_vec[1])*in_vec[4] + cos(in_vec[0])*cos(in_vec[1])*cos(in_vec[2])*in_vec[3];
+   out_2107061543090158966[14] = (sin(in_vec[0])*sin(in_vec[2]) + sin(in_vec[1])*cos(in_vec[0])*cos(in_vec[2]))*in_vec[4] + (sin(in_vec[0])*cos(in_vec[2]) - sin(in_vec[1])*sin(in_vec[2])*cos(in_vec[0]))*in_vec[3];
+   out_2107061543090158966[15] = sin(in_vec[0])*sin(in_vec[2]) + sin(in_vec[1])*cos(in_vec[0])*cos(in_vec[2]);
+   out_2107061543090158966[16] = -sin(in_vec[0])*cos(in_vec[2]) + sin(in_vec[1])*sin(in_vec[2])*cos(in_vec[0]);
+   out_2107061543090158966[17] = cos(in_vec[0])*cos(in_vec[1]);
 }
-void err_fun(double *nom_x, double *delta_x, double *out_3356596097038928074) {
-   out_3356596097038928074[0] = delta_x[0] + nom_x[0];
-   out_3356596097038928074[1] = delta_x[1] + nom_x[1];
-   out_3356596097038928074[2] = delta_x[2] + nom_x[2];
-   out_3356596097038928074[3] = -0.5*delta_x[3]*nom_x[4] - 0.5*delta_x[4]*nom_x[5] - 0.5*delta_x[5]*nom_x[6] + 1.0*nom_x[3];
-   out_3356596097038928074[4] = 0.5*delta_x[3]*nom_x[3] + 0.5*delta_x[4]*nom_x[6] - 0.5*delta_x[5]*nom_x[5] + 1.0*nom_x[4];
-   out_3356596097038928074[5] = -0.5*delta_x[3]*nom_x[6] + 0.5*delta_x[4]*nom_x[3] + 0.5*delta_x[5]*nom_x[4] + 1.0*nom_x[5];
-   out_3356596097038928074[6] = 0.5*delta_x[3]*nom_x[5] - 0.5*delta_x[4]*nom_x[4] + 0.5*delta_x[5]*nom_x[3] + 1.0*nom_x[6];
-   out_3356596097038928074[7] = delta_x[6] + nom_x[7];
-   out_3356596097038928074[8] = delta_x[7] + nom_x[8];
-   out_3356596097038928074[9] = delta_x[8] + nom_x[9];
-   out_3356596097038928074[10] = delta_x[9] + nom_x[10];
-   out_3356596097038928074[11] = delta_x[10] + nom_x[11];
-   out_3356596097038928074[12] = delta_x[11] + nom_x[12];
-   out_3356596097038928074[13] = delta_x[12] + nom_x[13];
-   out_3356596097038928074[14] = delta_x[13] + nom_x[14];
-   out_3356596097038928074[15] = delta_x[14] + nom_x[15];
-   out_3356596097038928074[16] = delta_x[15] + nom_x[16];
-   out_3356596097038928074[17] = delta_x[16] + nom_x[17];
-   out_3356596097038928074[18] = delta_x[17] + nom_x[18];
-   out_3356596097038928074[19] = delta_x[18] + nom_x[19];
-   out_3356596097038928074[20] = delta_x[19] + nom_x[20];
-   out_3356596097038928074[21] = delta_x[20] + nom_x[21];
+void err_fun(double *nom_x, double *delta_x, double *out_1090842864546838841) {
+   out_1090842864546838841[0] = delta_x[0] + nom_x[0];
+   out_1090842864546838841[1] = delta_x[1] + nom_x[1];
+   out_1090842864546838841[2] = delta_x[2] + nom_x[2];
+   out_1090842864546838841[3] = -0.5*delta_x[3]*nom_x[4] - 0.5*delta_x[4]*nom_x[5] - 0.5*delta_x[5]*nom_x[6] + 1.0*nom_x[3];
+   out_1090842864546838841[4] = 0.5*delta_x[3]*nom_x[3] + 0.5*delta_x[4]*nom_x[6] - 0.5*delta_x[5]*nom_x[5] + 1.0*nom_x[4];
+   out_1090842864546838841[5] = -0.5*delta_x[3]*nom_x[6] + 0.5*delta_x[4]*nom_x[3] + 0.5*delta_x[5]*nom_x[4] + 1.0*nom_x[5];
+   out_1090842864546838841[6] = 0.5*delta_x[3]*nom_x[5] - 0.5*delta_x[4]*nom_x[4] + 0.5*delta_x[5]*nom_x[3] + 1.0*nom_x[6];
+   out_1090842864546838841[7] = delta_x[6] + nom_x[7];
+   out_1090842864546838841[8] = delta_x[7] + nom_x[8];
+   out_1090842864546838841[9] = delta_x[8] + nom_x[9];
+   out_1090842864546838841[10] = delta_x[9] + nom_x[10];
+   out_1090842864546838841[11] = delta_x[10] + nom_x[11];
+   out_1090842864546838841[12] = delta_x[11] + nom_x[12];
+   out_1090842864546838841[13] = delta_x[12] + nom_x[13];
+   out_1090842864546838841[14] = delta_x[13] + nom_x[14];
+   out_1090842864546838841[15] = delta_x[14] + nom_x[15];
+   out_1090842864546838841[16] = delta_x[15] + nom_x[16];
+   out_1090842864546838841[17] = delta_x[16] + nom_x[17];
+   out_1090842864546838841[18] = delta_x[17] + nom_x[18];
+   out_1090842864546838841[19] = delta_x[18] + nom_x[19];
+   out_1090842864546838841[20] = delta_x[19] + nom_x[20];
+   out_1090842864546838841[21] = delta_x[20] + nom_x[21];
 }
-void inv_err_fun(double *nom_x, double *true_x, double *out_4391465575185495497) {
-   out_4391465575185495497[0] = -nom_x[0] + true_x[0];
-   out_4391465575185495497[1] = -nom_x[1] + true_x[1];
-   out_4391465575185495497[2] = -nom_x[2] + true_x[2];
-   out_4391465575185495497[3] = 2*nom_x[3]*true_x[4] - 2*nom_x[4]*true_x[3] + 2*nom_x[5]*true_x[6] - 2*nom_x[6]*true_x[5];
-   out_4391465575185495497[4] = 2*nom_x[3]*true_x[5] - 2*nom_x[4]*true_x[6] - 2*nom_x[5]*true_x[3] + 2*nom_x[6]*true_x[4];
-   out_4391465575185495497[5] = 2*nom_x[3]*true_x[6] + 2*nom_x[4]*true_x[5] - 2*nom_x[5]*true_x[4] - 2*nom_x[6]*true_x[3];
-   out_4391465575185495497[6] = -nom_x[7] + true_x[7];
-   out_4391465575185495497[7] = -nom_x[8] + true_x[8];
-   out_4391465575185495497[8] = -nom_x[9] + true_x[9];
-   out_4391465575185495497[9] = -nom_x[10] + true_x[10];
-   out_4391465575185495497[10] = -nom_x[11] + true_x[11];
-   out_4391465575185495497[11] = -nom_x[12] + true_x[12];
-   out_4391465575185495497[12] = -nom_x[13] + true_x[13];
-   out_4391465575185495497[13] = -nom_x[14] + true_x[14];
-   out_4391465575185495497[14] = -nom_x[15] + true_x[15];
-   out_4391465575185495497[15] = -nom_x[16] + true_x[16];
-   out_4391465575185495497[16] = -nom_x[17] + true_x[17];
-   out_4391465575185495497[17] = -nom_x[18] + true_x[18];
-   out_4391465575185495497[18] = -nom_x[19] + true_x[19];
-   out_4391465575185495497[19] = -nom_x[20] + true_x[20];
-   out_4391465575185495497[20] = -nom_x[21] + true_x[21];
+void inv_err_fun(double *nom_x, double *true_x, double *out_1751534880763809428) {
+   out_1751534880763809428[0] = -nom_x[0] + true_x[0];
+   out_1751534880763809428[1] = -nom_x[1] + true_x[1];
+   out_1751534880763809428[2] = -nom_x[2] + true_x[2];
+   out_1751534880763809428[3] = 2*nom_x[3]*true_x[4] - 2*nom_x[4]*true_x[3] + 2*nom_x[5]*true_x[6] - 2*nom_x[6]*true_x[5];
+   out_1751534880763809428[4] = 2*nom_x[3]*true_x[5] - 2*nom_x[4]*true_x[6] - 2*nom_x[5]*true_x[3] + 2*nom_x[6]*true_x[4];
+   out_1751534880763809428[5] = 2*nom_x[3]*true_x[6] + 2*nom_x[4]*true_x[5] - 2*nom_x[5]*true_x[4] - 2*nom_x[6]*true_x[3];
+   out_1751534880763809428[6] = -nom_x[7] + true_x[7];
+   out_1751534880763809428[7] = -nom_x[8] + true_x[8];
+   out_1751534880763809428[8] = -nom_x[9] + true_x[9];
+   out_1751534880763809428[9] = -nom_x[10] + true_x[10];
+   out_1751534880763809428[10] = -nom_x[11] + true_x[11];
+   out_1751534880763809428[11] = -nom_x[12] + true_x[12];
+   out_1751534880763809428[12] = -nom_x[13] + true_x[13];
+   out_1751534880763809428[13] = -nom_x[14] + true_x[14];
+   out_1751534880763809428[14] = -nom_x[15] + true_x[15];
+   out_1751534880763809428[15] = -nom_x[16] + true_x[16];
+   out_1751534880763809428[16] = -nom_x[17] + true_x[17];
+   out_1751534880763809428[17] = -nom_x[18] + true_x[18];
+   out_1751534880763809428[18] = -nom_x[19] + true_x[19];
+   out_1751534880763809428[19] = -nom_x[20] + true_x[20];
+   out_1751534880763809428[20] = -nom_x[21] + true_x[21];
 }
-void H_mod_fun(double *state, double *out_4990766548554672415) {
-   out_4990766548554672415[0] = 1.0;
-   out_4990766548554672415[1] = 0;
-   out_4990766548554672415[2] = 0;
-   out_4990766548554672415[3] = 0;
-   out_4990766548554672415[4] = 0;
-   out_4990766548554672415[5] = 0;
-   out_4990766548554672415[6] = 0;
-   out_4990766548554672415[7] = 0;
-   out_4990766548554672415[8] = 0;
-   out_4990766548554672415[9] = 0;
-   out_4990766548554672415[10] = 0;
-   out_4990766548554672415[11] = 0;
-   out_4990766548554672415[12] = 0;
-   out_4990766548554672415[13] = 0;
-   out_4990766548554672415[14] = 0;
-   out_4990766548554672415[15] = 0;
-   out_4990766548554672415[16] = 0;
-   out_4990766548554672415[17] = 0;
-   out_4990766548554672415[18] = 0;
-   out_4990766548554672415[19] = 0;
-   out_4990766548554672415[20] = 0;
-   out_4990766548554672415[21] = 0;
-   out_4990766548554672415[22] = 1.0;
-   out_4990766548554672415[23] = 0;
-   out_4990766548554672415[24] = 0;
-   out_4990766548554672415[25] = 0;
-   out_4990766548554672415[26] = 0;
-   out_4990766548554672415[27] = 0;
-   out_4990766548554672415[28] = 0;
-   out_4990766548554672415[29] = 0;
-   out_4990766548554672415[30] = 0;
-   out_4990766548554672415[31] = 0;
-   out_4990766548554672415[32] = 0;
-   out_4990766548554672415[33] = 0;
-   out_4990766548554672415[34] = 0;
-   out_4990766548554672415[35] = 0;
-   out_4990766548554672415[36] = 0;
-   out_4990766548554672415[37] = 0;
-   out_4990766548554672415[38] = 0;
-   out_4990766548554672415[39] = 0;
-   out_4990766548554672415[40] = 0;
-   out_4990766548554672415[41] = 0;
-   out_4990766548554672415[42] = 0;
-   out_4990766548554672415[43] = 0;
-   out_4990766548554672415[44] = 1.0;
-   out_4990766548554672415[45] = 0;
-   out_4990766548554672415[46] = 0;
-   out_4990766548554672415[47] = 0;
-   out_4990766548554672415[48] = 0;
-   out_4990766548554672415[49] = 0;
-   out_4990766548554672415[50] = 0;
-   out_4990766548554672415[51] = 0;
-   out_4990766548554672415[52] = 0;
-   out_4990766548554672415[53] = 0;
-   out_4990766548554672415[54] = 0;
-   out_4990766548554672415[55] = 0;
-   out_4990766548554672415[56] = 0;
-   out_4990766548554672415[57] = 0;
-   out_4990766548554672415[58] = 0;
-   out_4990766548554672415[59] = 0;
-   out_4990766548554672415[60] = 0;
-   out_4990766548554672415[61] = 0;
-   out_4990766548554672415[62] = 0;
-   out_4990766548554672415[63] = 0;
-   out_4990766548554672415[64] = 0;
-   out_4990766548554672415[65] = 0;
-   out_4990766548554672415[66] = -0.5*state[4];
-   out_4990766548554672415[67] = -0.5*state[5];
-   out_4990766548554672415[68] = -0.5*state[6];
-   out_4990766548554672415[69] = 0;
-   out_4990766548554672415[70] = 0;
-   out_4990766548554672415[71] = 0;
-   out_4990766548554672415[72] = 0;
-   out_4990766548554672415[73] = 0;
-   out_4990766548554672415[74] = 0;
-   out_4990766548554672415[75] = 0;
-   out_4990766548554672415[76] = 0;
-   out_4990766548554672415[77] = 0;
-   out_4990766548554672415[78] = 0;
-   out_4990766548554672415[79] = 0;
-   out_4990766548554672415[80] = 0;
-   out_4990766548554672415[81] = 0;
-   out_4990766548554672415[82] = 0;
-   out_4990766548554672415[83] = 0;
-   out_4990766548554672415[84] = 0;
-   out_4990766548554672415[85] = 0;
-   out_4990766548554672415[86] = 0;
-   out_4990766548554672415[87] = 0.5*state[3];
-   out_4990766548554672415[88] = 0.5*state[6];
-   out_4990766548554672415[89] = -0.5*state[5];
-   out_4990766548554672415[90] = 0;
-   out_4990766548554672415[91] = 0;
-   out_4990766548554672415[92] = 0;
-   out_4990766548554672415[93] = 0;
-   out_4990766548554672415[94] = 0;
-   out_4990766548554672415[95] = 0;
-   out_4990766548554672415[96] = 0;
-   out_4990766548554672415[97] = 0;
-   out_4990766548554672415[98] = 0;
-   out_4990766548554672415[99] = 0;
-   out_4990766548554672415[100] = 0;
-   out_4990766548554672415[101] = 0;
-   out_4990766548554672415[102] = 0;
-   out_4990766548554672415[103] = 0;
-   out_4990766548554672415[104] = 0;
-   out_4990766548554672415[105] = 0;
-   out_4990766548554672415[106] = 0;
-   out_4990766548554672415[107] = 0;
-   out_4990766548554672415[108] = -0.5*state[6];
-   out_4990766548554672415[109] = 0.5*state[3];
-   out_4990766548554672415[110] = 0.5*state[4];
-   out_4990766548554672415[111] = 0;
-   out_4990766548554672415[112] = 0;
-   out_4990766548554672415[113] = 0;
-   out_4990766548554672415[114] = 0;
-   out_4990766548554672415[115] = 0;
-   out_4990766548554672415[116] = 0;
-   out_4990766548554672415[117] = 0;
-   out_4990766548554672415[118] = 0;
-   out_4990766548554672415[119] = 0;
-   out_4990766548554672415[120] = 0;
-   out_4990766548554672415[121] = 0;
-   out_4990766548554672415[122] = 0;
-   out_4990766548554672415[123] = 0;
-   out_4990766548554672415[124] = 0;
-   out_4990766548554672415[125] = 0;
-   out_4990766548554672415[126] = 0;
-   out_4990766548554672415[127] = 0;
-   out_4990766548554672415[128] = 0;
-   out_4990766548554672415[129] = 0.5*state[5];
-   out_4990766548554672415[130] = -0.5*state[4];
-   out_4990766548554672415[131] = 0.5*state[3];
-   out_4990766548554672415[132] = 0;
-   out_4990766548554672415[133] = 0;
-   out_4990766548554672415[134] = 0;
-   out_4990766548554672415[135] = 0;
-   out_4990766548554672415[136] = 0;
-   out_4990766548554672415[137] = 0;
-   out_4990766548554672415[138] = 0;
-   out_4990766548554672415[139] = 0;
-   out_4990766548554672415[140] = 0;
-   out_4990766548554672415[141] = 0;
-   out_4990766548554672415[142] = 0;
-   out_4990766548554672415[143] = 0;
-   out_4990766548554672415[144] = 0;
-   out_4990766548554672415[145] = 0;
-   out_4990766548554672415[146] = 0;
-   out_4990766548554672415[147] = 0;
-   out_4990766548554672415[148] = 0;
-   out_4990766548554672415[149] = 0;
-   out_4990766548554672415[150] = 0;
-   out_4990766548554672415[151] = 0;
-   out_4990766548554672415[152] = 0;
-   out_4990766548554672415[153] = 1.0;
-   out_4990766548554672415[154] = 0;
-   out_4990766548554672415[155] = 0;
-   out_4990766548554672415[156] = 0;
-   out_4990766548554672415[157] = 0;
-   out_4990766548554672415[158] = 0;
-   out_4990766548554672415[159] = 0;
-   out_4990766548554672415[160] = 0;
-   out_4990766548554672415[161] = 0;
-   out_4990766548554672415[162] = 0;
-   out_4990766548554672415[163] = 0;
-   out_4990766548554672415[164] = 0;
-   out_4990766548554672415[165] = 0;
-   out_4990766548554672415[166] = 0;
-   out_4990766548554672415[167] = 0;
-   out_4990766548554672415[168] = 0;
-   out_4990766548554672415[169] = 0;
-   out_4990766548554672415[170] = 0;
-   out_4990766548554672415[171] = 0;
-   out_4990766548554672415[172] = 0;
-   out_4990766548554672415[173] = 0;
-   out_4990766548554672415[174] = 0;
-   out_4990766548554672415[175] = 1.0;
-   out_4990766548554672415[176] = 0;
-   out_4990766548554672415[177] = 0;
-   out_4990766548554672415[178] = 0;
-   out_4990766548554672415[179] = 0;
-   out_4990766548554672415[180] = 0;
-   out_4990766548554672415[181] = 0;
-   out_4990766548554672415[182] = 0;
-   out_4990766548554672415[183] = 0;
-   out_4990766548554672415[184] = 0;
-   out_4990766548554672415[185] = 0;
-   out_4990766548554672415[186] = 0;
-   out_4990766548554672415[187] = 0;
-   out_4990766548554672415[188] = 0;
-   out_4990766548554672415[189] = 0;
-   out_4990766548554672415[190] = 0;
-   out_4990766548554672415[191] = 0;
-   out_4990766548554672415[192] = 0;
-   out_4990766548554672415[193] = 0;
-   out_4990766548554672415[194] = 0;
-   out_4990766548554672415[195] = 0;
-   out_4990766548554672415[196] = 0;
-   out_4990766548554672415[197] = 1.0;
-   out_4990766548554672415[198] = 0;
-   out_4990766548554672415[199] = 0;
-   out_4990766548554672415[200] = 0;
-   out_4990766548554672415[201] = 0;
-   out_4990766548554672415[202] = 0;
-   out_4990766548554672415[203] = 0;
-   out_4990766548554672415[204] = 0;
-   out_4990766548554672415[205] = 0;
-   out_4990766548554672415[206] = 0;
-   out_4990766548554672415[207] = 0;
-   out_4990766548554672415[208] = 0;
-   out_4990766548554672415[209] = 0;
-   out_4990766548554672415[210] = 0;
-   out_4990766548554672415[211] = 0;
-   out_4990766548554672415[212] = 0;
-   out_4990766548554672415[213] = 0;
-   out_4990766548554672415[214] = 0;
-   out_4990766548554672415[215] = 0;
-   out_4990766548554672415[216] = 0;
-   out_4990766548554672415[217] = 0;
-   out_4990766548554672415[218] = 0;
-   out_4990766548554672415[219] = 1.0;
-   out_4990766548554672415[220] = 0;
-   out_4990766548554672415[221] = 0;
-   out_4990766548554672415[222] = 0;
-   out_4990766548554672415[223] = 0;
-   out_4990766548554672415[224] = 0;
-   out_4990766548554672415[225] = 0;
-   out_4990766548554672415[226] = 0;
-   out_4990766548554672415[227] = 0;
-   out_4990766548554672415[228] = 0;
-   out_4990766548554672415[229] = 0;
-   out_4990766548554672415[230] = 0;
-   out_4990766548554672415[231] = 0;
-   out_4990766548554672415[232] = 0;
-   out_4990766548554672415[233] = 0;
-   out_4990766548554672415[234] = 0;
-   out_4990766548554672415[235] = 0;
-   out_4990766548554672415[236] = 0;
-   out_4990766548554672415[237] = 0;
-   out_4990766548554672415[238] = 0;
-   out_4990766548554672415[239] = 0;
-   out_4990766548554672415[240] = 0;
-   out_4990766548554672415[241] = 1.0;
-   out_4990766548554672415[242] = 0;
-   out_4990766548554672415[243] = 0;
-   out_4990766548554672415[244] = 0;
-   out_4990766548554672415[245] = 0;
-   out_4990766548554672415[246] = 0;
-   out_4990766548554672415[247] = 0;
-   out_4990766548554672415[248] = 0;
-   out_4990766548554672415[249] = 0;
-   out_4990766548554672415[250] = 0;
-   out_4990766548554672415[251] = 0;
-   out_4990766548554672415[252] = 0;
-   out_4990766548554672415[253] = 0;
-   out_4990766548554672415[254] = 0;
-   out_4990766548554672415[255] = 0;
-   out_4990766548554672415[256] = 0;
-   out_4990766548554672415[257] = 0;
-   out_4990766548554672415[258] = 0;
-   out_4990766548554672415[259] = 0;
-   out_4990766548554672415[260] = 0;
-   out_4990766548554672415[261] = 0;
-   out_4990766548554672415[262] = 0;
-   out_4990766548554672415[263] = 1.0;
-   out_4990766548554672415[264] = 0;
-   out_4990766548554672415[265] = 0;
-   out_4990766548554672415[266] = 0;
-   out_4990766548554672415[267] = 0;
-   out_4990766548554672415[268] = 0;
-   out_4990766548554672415[269] = 0;
-   out_4990766548554672415[270] = 0;
-   out_4990766548554672415[271] = 0;
-   out_4990766548554672415[272] = 0;
-   out_4990766548554672415[273] = 0;
-   out_4990766548554672415[274] = 0;
-   out_4990766548554672415[275] = 0;
-   out_4990766548554672415[276] = 0;
-   out_4990766548554672415[277] = 0;
-   out_4990766548554672415[278] = 0;
-   out_4990766548554672415[279] = 0;
-   out_4990766548554672415[280] = 0;
-   out_4990766548554672415[281] = 0;
-   out_4990766548554672415[282] = 0;
-   out_4990766548554672415[283] = 0;
-   out_4990766548554672415[284] = 0;
-   out_4990766548554672415[285] = 1.0;
-   out_4990766548554672415[286] = 0;
-   out_4990766548554672415[287] = 0;
-   out_4990766548554672415[288] = 0;
-   out_4990766548554672415[289] = 0;
-   out_4990766548554672415[290] = 0;
-   out_4990766548554672415[291] = 0;
-   out_4990766548554672415[292] = 0;
-   out_4990766548554672415[293] = 0;
-   out_4990766548554672415[294] = 0;
-   out_4990766548554672415[295] = 0;
-   out_4990766548554672415[296] = 0;
-   out_4990766548554672415[297] = 0;
-   out_4990766548554672415[298] = 0;
-   out_4990766548554672415[299] = 0;
-   out_4990766548554672415[300] = 0;
-   out_4990766548554672415[301] = 0;
-   out_4990766548554672415[302] = 0;
-   out_4990766548554672415[303] = 0;
-   out_4990766548554672415[304] = 0;
-   out_4990766548554672415[305] = 0;
-   out_4990766548554672415[306] = 0;
-   out_4990766548554672415[307] = 1.0;
-   out_4990766548554672415[308] = 0;
-   out_4990766548554672415[309] = 0;
-   out_4990766548554672415[310] = 0;
-   out_4990766548554672415[311] = 0;
-   out_4990766548554672415[312] = 0;
-   out_4990766548554672415[313] = 0;
-   out_4990766548554672415[314] = 0;
-   out_4990766548554672415[315] = 0;
-   out_4990766548554672415[316] = 0;
-   out_4990766548554672415[317] = 0;
-   out_4990766548554672415[318] = 0;
-   out_4990766548554672415[319] = 0;
-   out_4990766548554672415[320] = 0;
-   out_4990766548554672415[321] = 0;
-   out_4990766548554672415[322] = 0;
-   out_4990766548554672415[323] = 0;
-   out_4990766548554672415[324] = 0;
-   out_4990766548554672415[325] = 0;
-   out_4990766548554672415[326] = 0;
-   out_4990766548554672415[327] = 0;
-   out_4990766548554672415[328] = 0;
-   out_4990766548554672415[329] = 1.0;
-   out_4990766548554672415[330] = 0;
-   out_4990766548554672415[331] = 0;
-   out_4990766548554672415[332] = 0;
-   out_4990766548554672415[333] = 0;
-   out_4990766548554672415[334] = 0;
-   out_4990766548554672415[335] = 0;
-   out_4990766548554672415[336] = 0;
-   out_4990766548554672415[337] = 0;
-   out_4990766548554672415[338] = 0;
-   out_4990766548554672415[339] = 0;
-   out_4990766548554672415[340] = 0;
-   out_4990766548554672415[341] = 0;
-   out_4990766548554672415[342] = 0;
-   out_4990766548554672415[343] = 0;
-   out_4990766548554672415[344] = 0;
-   out_4990766548554672415[345] = 0;
-   out_4990766548554672415[346] = 0;
-   out_4990766548554672415[347] = 0;
-   out_4990766548554672415[348] = 0;
-   out_4990766548554672415[349] = 0;
-   out_4990766548554672415[350] = 0;
-   out_4990766548554672415[351] = 1.0;
-   out_4990766548554672415[352] = 0;
-   out_4990766548554672415[353] = 0;
-   out_4990766548554672415[354] = 0;
-   out_4990766548554672415[355] = 0;
-   out_4990766548554672415[356] = 0;
-   out_4990766548554672415[357] = 0;
-   out_4990766548554672415[358] = 0;
-   out_4990766548554672415[359] = 0;
-   out_4990766548554672415[360] = 0;
-   out_4990766548554672415[361] = 0;
-   out_4990766548554672415[362] = 0;
-   out_4990766548554672415[363] = 0;
-   out_4990766548554672415[364] = 0;
-   out_4990766548554672415[365] = 0;
-   out_4990766548554672415[366] = 0;
-   out_4990766548554672415[367] = 0;
-   out_4990766548554672415[368] = 0;
-   out_4990766548554672415[369] = 0;
-   out_4990766548554672415[370] = 0;
-   out_4990766548554672415[371] = 0;
-   out_4990766548554672415[372] = 0;
-   out_4990766548554672415[373] = 1.0;
-   out_4990766548554672415[374] = 0;
-   out_4990766548554672415[375] = 0;
-   out_4990766548554672415[376] = 0;
-   out_4990766548554672415[377] = 0;
-   out_4990766548554672415[378] = 0;
-   out_4990766548554672415[379] = 0;
-   out_4990766548554672415[380] = 0;
-   out_4990766548554672415[381] = 0;
-   out_4990766548554672415[382] = 0;
-   out_4990766548554672415[383] = 0;
-   out_4990766548554672415[384] = 0;
-   out_4990766548554672415[385] = 0;
-   out_4990766548554672415[386] = 0;
-   out_4990766548554672415[387] = 0;
-   out_4990766548554672415[388] = 0;
-   out_4990766548554672415[389] = 0;
-   out_4990766548554672415[390] = 0;
-   out_4990766548554672415[391] = 0;
-   out_4990766548554672415[392] = 0;
-   out_4990766548554672415[393] = 0;
-   out_4990766548554672415[394] = 0;
-   out_4990766548554672415[395] = 1.0;
-   out_4990766548554672415[396] = 0;
-   out_4990766548554672415[397] = 0;
-   out_4990766548554672415[398] = 0;
-   out_4990766548554672415[399] = 0;
-   out_4990766548554672415[400] = 0;
-   out_4990766548554672415[401] = 0;
-   out_4990766548554672415[402] = 0;
-   out_4990766548554672415[403] = 0;
-   out_4990766548554672415[404] = 0;
-   out_4990766548554672415[405] = 0;
-   out_4990766548554672415[406] = 0;
-   out_4990766548554672415[407] = 0;
-   out_4990766548554672415[408] = 0;
-   out_4990766548554672415[409] = 0;
-   out_4990766548554672415[410] = 0;
-   out_4990766548554672415[411] = 0;
-   out_4990766548554672415[412] = 0;
-   out_4990766548554672415[413] = 0;
-   out_4990766548554672415[414] = 0;
-   out_4990766548554672415[415] = 0;
-   out_4990766548554672415[416] = 0;
-   out_4990766548554672415[417] = 1.0;
-   out_4990766548554672415[418] = 0;
-   out_4990766548554672415[419] = 0;
-   out_4990766548554672415[420] = 0;
-   out_4990766548554672415[421] = 0;
-   out_4990766548554672415[422] = 0;
-   out_4990766548554672415[423] = 0;
-   out_4990766548554672415[424] = 0;
-   out_4990766548554672415[425] = 0;
-   out_4990766548554672415[426] = 0;
-   out_4990766548554672415[427] = 0;
-   out_4990766548554672415[428] = 0;
-   out_4990766548554672415[429] = 0;
-   out_4990766548554672415[430] = 0;
-   out_4990766548554672415[431] = 0;
-   out_4990766548554672415[432] = 0;
-   out_4990766548554672415[433] = 0;
-   out_4990766548554672415[434] = 0;
-   out_4990766548554672415[435] = 0;
-   out_4990766548554672415[436] = 0;
-   out_4990766548554672415[437] = 0;
-   out_4990766548554672415[438] = 0;
-   out_4990766548554672415[439] = 1.0;
-   out_4990766548554672415[440] = 0;
-   out_4990766548554672415[441] = 0;
-   out_4990766548554672415[442] = 0;
-   out_4990766548554672415[443] = 0;
-   out_4990766548554672415[444] = 0;
-   out_4990766548554672415[445] = 0;
-   out_4990766548554672415[446] = 0;
-   out_4990766548554672415[447] = 0;
-   out_4990766548554672415[448] = 0;
-   out_4990766548554672415[449] = 0;
-   out_4990766548554672415[450] = 0;
-   out_4990766548554672415[451] = 0;
-   out_4990766548554672415[452] = 0;
-   out_4990766548554672415[453] = 0;
-   out_4990766548554672415[454] = 0;
-   out_4990766548554672415[455] = 0;
-   out_4990766548554672415[456] = 0;
-   out_4990766548554672415[457] = 0;
-   out_4990766548554672415[458] = 0;
-   out_4990766548554672415[459] = 0;
-   out_4990766548554672415[460] = 0;
-   out_4990766548554672415[461] = 1.0;
+void H_mod_fun(double *state, double *out_2270168032272230264) {
+   out_2270168032272230264[0] = 1.0;
+   out_2270168032272230264[1] = 0;
+   out_2270168032272230264[2] = 0;
+   out_2270168032272230264[3] = 0;
+   out_2270168032272230264[4] = 0;
+   out_2270168032272230264[5] = 0;
+   out_2270168032272230264[6] = 0;
+   out_2270168032272230264[7] = 0;
+   out_2270168032272230264[8] = 0;
+   out_2270168032272230264[9] = 0;
+   out_2270168032272230264[10] = 0;
+   out_2270168032272230264[11] = 0;
+   out_2270168032272230264[12] = 0;
+   out_2270168032272230264[13] = 0;
+   out_2270168032272230264[14] = 0;
+   out_2270168032272230264[15] = 0;
+   out_2270168032272230264[16] = 0;
+   out_2270168032272230264[17] = 0;
+   out_2270168032272230264[18] = 0;
+   out_2270168032272230264[19] = 0;
+   out_2270168032272230264[20] = 0;
+   out_2270168032272230264[21] = 0;
+   out_2270168032272230264[22] = 1.0;
+   out_2270168032272230264[23] = 0;
+   out_2270168032272230264[24] = 0;
+   out_2270168032272230264[25] = 0;
+   out_2270168032272230264[26] = 0;
+   out_2270168032272230264[27] = 0;
+   out_2270168032272230264[28] = 0;
+   out_2270168032272230264[29] = 0;
+   out_2270168032272230264[30] = 0;
+   out_2270168032272230264[31] = 0;
+   out_2270168032272230264[32] = 0;
+   out_2270168032272230264[33] = 0;
+   out_2270168032272230264[34] = 0;
+   out_2270168032272230264[35] = 0;
+   out_2270168032272230264[36] = 0;
+   out_2270168032272230264[37] = 0;
+   out_2270168032272230264[38] = 0;
+   out_2270168032272230264[39] = 0;
+   out_2270168032272230264[40] = 0;
+   out_2270168032272230264[41] = 0;
+   out_2270168032272230264[42] = 0;
+   out_2270168032272230264[43] = 0;
+   out_2270168032272230264[44] = 1.0;
+   out_2270168032272230264[45] = 0;
+   out_2270168032272230264[46] = 0;
+   out_2270168032272230264[47] = 0;
+   out_2270168032272230264[48] = 0;
+   out_2270168032272230264[49] = 0;
+   out_2270168032272230264[50] = 0;
+   out_2270168032272230264[51] = 0;
+   out_2270168032272230264[52] = 0;
+   out_2270168032272230264[53] = 0;
+   out_2270168032272230264[54] = 0;
+   out_2270168032272230264[55] = 0;
+   out_2270168032272230264[56] = 0;
+   out_2270168032272230264[57] = 0;
+   out_2270168032272230264[58] = 0;
+   out_2270168032272230264[59] = 0;
+   out_2270168032272230264[60] = 0;
+   out_2270168032272230264[61] = 0;
+   out_2270168032272230264[62] = 0;
+   out_2270168032272230264[63] = 0;
+   out_2270168032272230264[64] = 0;
+   out_2270168032272230264[65] = 0;
+   out_2270168032272230264[66] = -0.5*state[4];
+   out_2270168032272230264[67] = -0.5*state[5];
+   out_2270168032272230264[68] = -0.5*state[6];
+   out_2270168032272230264[69] = 0;
+   out_2270168032272230264[70] = 0;
+   out_2270168032272230264[71] = 0;
+   out_2270168032272230264[72] = 0;
+   out_2270168032272230264[73] = 0;
+   out_2270168032272230264[74] = 0;
+   out_2270168032272230264[75] = 0;
+   out_2270168032272230264[76] = 0;
+   out_2270168032272230264[77] = 0;
+   out_2270168032272230264[78] = 0;
+   out_2270168032272230264[79] = 0;
+   out_2270168032272230264[80] = 0;
+   out_2270168032272230264[81] = 0;
+   out_2270168032272230264[82] = 0;
+   out_2270168032272230264[83] = 0;
+   out_2270168032272230264[84] = 0;
+   out_2270168032272230264[85] = 0;
+   out_2270168032272230264[86] = 0;
+   out_2270168032272230264[87] = 0.5*state[3];
+   out_2270168032272230264[88] = 0.5*state[6];
+   out_2270168032272230264[89] = -0.5*state[5];
+   out_2270168032272230264[90] = 0;
+   out_2270168032272230264[91] = 0;
+   out_2270168032272230264[92] = 0;
+   out_2270168032272230264[93] = 0;
+   out_2270168032272230264[94] = 0;
+   out_2270168032272230264[95] = 0;
+   out_2270168032272230264[96] = 0;
+   out_2270168032272230264[97] = 0;
+   out_2270168032272230264[98] = 0;
+   out_2270168032272230264[99] = 0;
+   out_2270168032272230264[100] = 0;
+   out_2270168032272230264[101] = 0;
+   out_2270168032272230264[102] = 0;
+   out_2270168032272230264[103] = 0;
+   out_2270168032272230264[104] = 0;
+   out_2270168032272230264[105] = 0;
+   out_2270168032272230264[106] = 0;
+   out_2270168032272230264[107] = 0;
+   out_2270168032272230264[108] = -0.5*state[6];
+   out_2270168032272230264[109] = 0.5*state[3];
+   out_2270168032272230264[110] = 0.5*state[4];
+   out_2270168032272230264[111] = 0;
+   out_2270168032272230264[112] = 0;
+   out_2270168032272230264[113] = 0;
+   out_2270168032272230264[114] = 0;
+   out_2270168032272230264[115] = 0;
+   out_2270168032272230264[116] = 0;
+   out_2270168032272230264[117] = 0;
+   out_2270168032272230264[118] = 0;
+   out_2270168032272230264[119] = 0;
+   out_2270168032272230264[120] = 0;
+   out_2270168032272230264[121] = 0;
+   out_2270168032272230264[122] = 0;
+   out_2270168032272230264[123] = 0;
+   out_2270168032272230264[124] = 0;
+   out_2270168032272230264[125] = 0;
+   out_2270168032272230264[126] = 0;
+   out_2270168032272230264[127] = 0;
+   out_2270168032272230264[128] = 0;
+   out_2270168032272230264[129] = 0.5*state[5];
+   out_2270168032272230264[130] = -0.5*state[4];
+   out_2270168032272230264[131] = 0.5*state[3];
+   out_2270168032272230264[132] = 0;
+   out_2270168032272230264[133] = 0;
+   out_2270168032272230264[134] = 0;
+   out_2270168032272230264[135] = 0;
+   out_2270168032272230264[136] = 0;
+   out_2270168032272230264[137] = 0;
+   out_2270168032272230264[138] = 0;
+   out_2270168032272230264[139] = 0;
+   out_2270168032272230264[140] = 0;
+   out_2270168032272230264[141] = 0;
+   out_2270168032272230264[142] = 0;
+   out_2270168032272230264[143] = 0;
+   out_2270168032272230264[144] = 0;
+   out_2270168032272230264[145] = 0;
+   out_2270168032272230264[146] = 0;
+   out_2270168032272230264[147] = 0;
+   out_2270168032272230264[148] = 0;
+   out_2270168032272230264[149] = 0;
+   out_2270168032272230264[150] = 0;
+   out_2270168032272230264[151] = 0;
+   out_2270168032272230264[152] = 0;
+   out_2270168032272230264[153] = 1.0;
+   out_2270168032272230264[154] = 0;
+   out_2270168032272230264[155] = 0;
+   out_2270168032272230264[156] = 0;
+   out_2270168032272230264[157] = 0;
+   out_2270168032272230264[158] = 0;
+   out_2270168032272230264[159] = 0;
+   out_2270168032272230264[160] = 0;
+   out_2270168032272230264[161] = 0;
+   out_2270168032272230264[162] = 0;
+   out_2270168032272230264[163] = 0;
+   out_2270168032272230264[164] = 0;
+   out_2270168032272230264[165] = 0;
+   out_2270168032272230264[166] = 0;
+   out_2270168032272230264[167] = 0;
+   out_2270168032272230264[168] = 0;
+   out_2270168032272230264[169] = 0;
+   out_2270168032272230264[170] = 0;
+   out_2270168032272230264[171] = 0;
+   out_2270168032272230264[172] = 0;
+   out_2270168032272230264[173] = 0;
+   out_2270168032272230264[174] = 0;
+   out_2270168032272230264[175] = 1.0;
+   out_2270168032272230264[176] = 0;
+   out_2270168032272230264[177] = 0;
+   out_2270168032272230264[178] = 0;
+   out_2270168032272230264[179] = 0;
+   out_2270168032272230264[180] = 0;
+   out_2270168032272230264[181] = 0;
+   out_2270168032272230264[182] = 0;
+   out_2270168032272230264[183] = 0;
+   out_2270168032272230264[184] = 0;
+   out_2270168032272230264[185] = 0;
+   out_2270168032272230264[186] = 0;
+   out_2270168032272230264[187] = 0;
+   out_2270168032272230264[188] = 0;
+   out_2270168032272230264[189] = 0;
+   out_2270168032272230264[190] = 0;
+   out_2270168032272230264[191] = 0;
+   out_2270168032272230264[192] = 0;
+   out_2270168032272230264[193] = 0;
+   out_2270168032272230264[194] = 0;
+   out_2270168032272230264[195] = 0;
+   out_2270168032272230264[196] = 0;
+   out_2270168032272230264[197] = 1.0;
+   out_2270168032272230264[198] = 0;
+   out_2270168032272230264[199] = 0;
+   out_2270168032272230264[200] = 0;
+   out_2270168032272230264[201] = 0;
+   out_2270168032272230264[202] = 0;
+   out_2270168032272230264[203] = 0;
+   out_2270168032272230264[204] = 0;
+   out_2270168032272230264[205] = 0;
+   out_2270168032272230264[206] = 0;
+   out_2270168032272230264[207] = 0;
+   out_2270168032272230264[208] = 0;
+   out_2270168032272230264[209] = 0;
+   out_2270168032272230264[210] = 0;
+   out_2270168032272230264[211] = 0;
+   out_2270168032272230264[212] = 0;
+   out_2270168032272230264[213] = 0;
+   out_2270168032272230264[214] = 0;
+   out_2270168032272230264[215] = 0;
+   out_2270168032272230264[216] = 0;
+   out_2270168032272230264[217] = 0;
+   out_2270168032272230264[218] = 0;
+   out_2270168032272230264[219] = 1.0;
+   out_2270168032272230264[220] = 0;
+   out_2270168032272230264[221] = 0;
+   out_2270168032272230264[222] = 0;
+   out_2270168032272230264[223] = 0;
+   out_2270168032272230264[224] = 0;
+   out_2270168032272230264[225] = 0;
+   out_2270168032272230264[226] = 0;
+   out_2270168032272230264[227] = 0;
+   out_2270168032272230264[228] = 0;
+   out_2270168032272230264[229] = 0;
+   out_2270168032272230264[230] = 0;
+   out_2270168032272230264[231] = 0;
+   out_2270168032272230264[232] = 0;
+   out_2270168032272230264[233] = 0;
+   out_2270168032272230264[234] = 0;
+   out_2270168032272230264[235] = 0;
+   out_2270168032272230264[236] = 0;
+   out_2270168032272230264[237] = 0;
+   out_2270168032272230264[238] = 0;
+   out_2270168032272230264[239] = 0;
+   out_2270168032272230264[240] = 0;
+   out_2270168032272230264[241] = 1.0;
+   out_2270168032272230264[242] = 0;
+   out_2270168032272230264[243] = 0;
+   out_2270168032272230264[244] = 0;
+   out_2270168032272230264[245] = 0;
+   out_2270168032272230264[246] = 0;
+   out_2270168032272230264[247] = 0;
+   out_2270168032272230264[248] = 0;
+   out_2270168032272230264[249] = 0;
+   out_2270168032272230264[250] = 0;
+   out_2270168032272230264[251] = 0;
+   out_2270168032272230264[252] = 0;
+   out_2270168032272230264[253] = 0;
+   out_2270168032272230264[254] = 0;
+   out_2270168032272230264[255] = 0;
+   out_2270168032272230264[256] = 0;
+   out_2270168032272230264[257] = 0;
+   out_2270168032272230264[258] = 0;
+   out_2270168032272230264[259] = 0;
+   out_2270168032272230264[260] = 0;
+   out_2270168032272230264[261] = 0;
+   out_2270168032272230264[262] = 0;
+   out_2270168032272230264[263] = 1.0;
+   out_2270168032272230264[264] = 0;
+   out_2270168032272230264[265] = 0;
+   out_2270168032272230264[266] = 0;
+   out_2270168032272230264[267] = 0;
+   out_2270168032272230264[268] = 0;
+   out_2270168032272230264[269] = 0;
+   out_2270168032272230264[270] = 0;
+   out_2270168032272230264[271] = 0;
+   out_2270168032272230264[272] = 0;
+   out_2270168032272230264[273] = 0;
+   out_2270168032272230264[274] = 0;
+   out_2270168032272230264[275] = 0;
+   out_2270168032272230264[276] = 0;
+   out_2270168032272230264[277] = 0;
+   out_2270168032272230264[278] = 0;
+   out_2270168032272230264[279] = 0;
+   out_2270168032272230264[280] = 0;
+   out_2270168032272230264[281] = 0;
+   out_2270168032272230264[282] = 0;
+   out_2270168032272230264[283] = 0;
+   out_2270168032272230264[284] = 0;
+   out_2270168032272230264[285] = 1.0;
+   out_2270168032272230264[286] = 0;
+   out_2270168032272230264[287] = 0;
+   out_2270168032272230264[288] = 0;
+   out_2270168032272230264[289] = 0;
+   out_2270168032272230264[290] = 0;
+   out_2270168032272230264[291] = 0;
+   out_2270168032272230264[292] = 0;
+   out_2270168032272230264[293] = 0;
+   out_2270168032272230264[294] = 0;
+   out_2270168032272230264[295] = 0;
+   out_2270168032272230264[296] = 0;
+   out_2270168032272230264[297] = 0;
+   out_2270168032272230264[298] = 0;
+   out_2270168032272230264[299] = 0;
+   out_2270168032272230264[300] = 0;
+   out_2270168032272230264[301] = 0;
+   out_2270168032272230264[302] = 0;
+   out_2270168032272230264[303] = 0;
+   out_2270168032272230264[304] = 0;
+   out_2270168032272230264[305] = 0;
+   out_2270168032272230264[306] = 0;
+   out_2270168032272230264[307] = 1.0;
+   out_2270168032272230264[308] = 0;
+   out_2270168032272230264[309] = 0;
+   out_2270168032272230264[310] = 0;
+   out_2270168032272230264[311] = 0;
+   out_2270168032272230264[312] = 0;
+   out_2270168032272230264[313] = 0;
+   out_2270168032272230264[314] = 0;
+   out_2270168032272230264[315] = 0;
+   out_2270168032272230264[316] = 0;
+   out_2270168032272230264[317] = 0;
+   out_2270168032272230264[318] = 0;
+   out_2270168032272230264[319] = 0;
+   out_2270168032272230264[320] = 0;
+   out_2270168032272230264[321] = 0;
+   out_2270168032272230264[322] = 0;
+   out_2270168032272230264[323] = 0;
+   out_2270168032272230264[324] = 0;
+   out_2270168032272230264[325] = 0;
+   out_2270168032272230264[326] = 0;
+   out_2270168032272230264[327] = 0;
+   out_2270168032272230264[328] = 0;
+   out_2270168032272230264[329] = 1.0;
+   out_2270168032272230264[330] = 0;
+   out_2270168032272230264[331] = 0;
+   out_2270168032272230264[332] = 0;
+   out_2270168032272230264[333] = 0;
+   out_2270168032272230264[334] = 0;
+   out_2270168032272230264[335] = 0;
+   out_2270168032272230264[336] = 0;
+   out_2270168032272230264[337] = 0;
+   out_2270168032272230264[338] = 0;
+   out_2270168032272230264[339] = 0;
+   out_2270168032272230264[340] = 0;
+   out_2270168032272230264[341] = 0;
+   out_2270168032272230264[342] = 0;
+   out_2270168032272230264[343] = 0;
+   out_2270168032272230264[344] = 0;
+   out_2270168032272230264[345] = 0;
+   out_2270168032272230264[346] = 0;
+   out_2270168032272230264[347] = 0;
+   out_2270168032272230264[348] = 0;
+   out_2270168032272230264[349] = 0;
+   out_2270168032272230264[350] = 0;
+   out_2270168032272230264[351] = 1.0;
+   out_2270168032272230264[352] = 0;
+   out_2270168032272230264[353] = 0;
+   out_2270168032272230264[354] = 0;
+   out_2270168032272230264[355] = 0;
+   out_2270168032272230264[356] = 0;
+   out_2270168032272230264[357] = 0;
+   out_2270168032272230264[358] = 0;
+   out_2270168032272230264[359] = 0;
+   out_2270168032272230264[360] = 0;
+   out_2270168032272230264[361] = 0;
+   out_2270168032272230264[362] = 0;
+   out_2270168032272230264[363] = 0;
+   out_2270168032272230264[364] = 0;
+   out_2270168032272230264[365] = 0;
+   out_2270168032272230264[366] = 0;
+   out_2270168032272230264[367] = 0;
+   out_2270168032272230264[368] = 0;
+   out_2270168032272230264[369] = 0;
+   out_2270168032272230264[370] = 0;
+   out_2270168032272230264[371] = 0;
+   out_2270168032272230264[372] = 0;
+   out_2270168032272230264[373] = 1.0;
+   out_2270168032272230264[374] = 0;
+   out_2270168032272230264[375] = 0;
+   out_2270168032272230264[376] = 0;
+   out_2270168032272230264[377] = 0;
+   out_2270168032272230264[378] = 0;
+   out_2270168032272230264[379] = 0;
+   out_2270168032272230264[380] = 0;
+   out_2270168032272230264[381] = 0;
+   out_2270168032272230264[382] = 0;
+   out_2270168032272230264[383] = 0;
+   out_2270168032272230264[384] = 0;
+   out_2270168032272230264[385] = 0;
+   out_2270168032272230264[386] = 0;
+   out_2270168032272230264[387] = 0;
+   out_2270168032272230264[388] = 0;
+   out_2270168032272230264[389] = 0;
+   out_2270168032272230264[390] = 0;
+   out_2270168032272230264[391] = 0;
+   out_2270168032272230264[392] = 0;
+   out_2270168032272230264[393] = 0;
+   out_2270168032272230264[394] = 0;
+   out_2270168032272230264[395] = 1.0;
+   out_2270168032272230264[396] = 0;
+   out_2270168032272230264[397] = 0;
+   out_2270168032272230264[398] = 0;
+   out_2270168032272230264[399] = 0;
+   out_2270168032272230264[400] = 0;
+   out_2270168032272230264[401] = 0;
+   out_2270168032272230264[402] = 0;
+   out_2270168032272230264[403] = 0;
+   out_2270168032272230264[404] = 0;
+   out_2270168032272230264[405] = 0;
+   out_2270168032272230264[406] = 0;
+   out_2270168032272230264[407] = 0;
+   out_2270168032272230264[408] = 0;
+   out_2270168032272230264[409] = 0;
+   out_2270168032272230264[410] = 0;
+   out_2270168032272230264[411] = 0;
+   out_2270168032272230264[412] = 0;
+   out_2270168032272230264[413] = 0;
+   out_2270168032272230264[414] = 0;
+   out_2270168032272230264[415] = 0;
+   out_2270168032272230264[416] = 0;
+   out_2270168032272230264[417] = 1.0;
+   out_2270168032272230264[418] = 0;
+   out_2270168032272230264[419] = 0;
+   out_2270168032272230264[420] = 0;
+   out_2270168032272230264[421] = 0;
+   out_2270168032272230264[422] = 0;
+   out_2270168032272230264[423] = 0;
+   out_2270168032272230264[424] = 0;
+   out_2270168032272230264[425] = 0;
+   out_2270168032272230264[426] = 0;
+   out_2270168032272230264[427] = 0;
+   out_2270168032272230264[428] = 0;
+   out_2270168032272230264[429] = 0;
+   out_2270168032272230264[430] = 0;
+   out_2270168032272230264[431] = 0;
+   out_2270168032272230264[432] = 0;
+   out_2270168032272230264[433] = 0;
+   out_2270168032272230264[434] = 0;
+   out_2270168032272230264[435] = 0;
+   out_2270168032272230264[436] = 0;
+   out_2270168032272230264[437] = 0;
+   out_2270168032272230264[438] = 0;
+   out_2270168032272230264[439] = 1.0;
+   out_2270168032272230264[440] = 0;
+   out_2270168032272230264[441] = 0;
+   out_2270168032272230264[442] = 0;
+   out_2270168032272230264[443] = 0;
+   out_2270168032272230264[444] = 0;
+   out_2270168032272230264[445] = 0;
+   out_2270168032272230264[446] = 0;
+   out_2270168032272230264[447] = 0;
+   out_2270168032272230264[448] = 0;
+   out_2270168032272230264[449] = 0;
+   out_2270168032272230264[450] = 0;
+   out_2270168032272230264[451] = 0;
+   out_2270168032272230264[452] = 0;
+   out_2270168032272230264[453] = 0;
+   out_2270168032272230264[454] = 0;
+   out_2270168032272230264[455] = 0;
+   out_2270168032272230264[456] = 0;
+   out_2270168032272230264[457] = 0;
+   out_2270168032272230264[458] = 0;
+   out_2270168032272230264[459] = 0;
+   out_2270168032272230264[460] = 0;
+   out_2270168032272230264[461] = 1.0;
 }
-void f_fun(double *state, double dt, double *out_3056772812413117361) {
-   out_3056772812413117361[0] = dt*state[7] + state[0];
-   out_3056772812413117361[1] = dt*state[8] + state[1];
-   out_3056772812413117361[2] = dt*state[9] + state[2];
-   out_3056772812413117361[3] = dt*(-0.5*state[4]*state[10] - 0.5*state[5]*state[11] - 0.5*state[6]*state[12]) + state[3];
-   out_3056772812413117361[4] = dt*(0.5*state[3]*state[10] + 0.5*state[5]*state[12] - 0.5*state[6]*state[11]) + state[4];
-   out_3056772812413117361[5] = dt*(0.5*state[3]*state[11] - 0.5*state[4]*state[12] + 0.5*state[6]*state[10]) + state[5];
-   out_3056772812413117361[6] = dt*(0.5*state[3]*state[12] + 0.5*state[4]*state[11] - 0.5*state[5]*state[10]) + state[6];
-   out_3056772812413117361[7] = dt*((2*state[3]*state[5] + 2*state[4]*state[6])*state[18] + (-2*state[3]*state[6] + 2*state[4]*state[5])*state[17] + (pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*state[16]) + state[7];
-   out_3056772812413117361[8] = dt*((-2*state[3]*state[4] + 2*state[5]*state[6])*state[18] + (2*state[3]*state[6] + 2*state[4]*state[5])*state[16] + (pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*state[17]) + state[8];
-   out_3056772812413117361[9] = dt*((2*state[3]*state[4] + 2*state[5]*state[6])*state[17] + (-2*state[3]*state[5] + 2*state[4]*state[6])*state[16] + (pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[18]) + state[9];
-   out_3056772812413117361[10] = state[10];
-   out_3056772812413117361[11] = state[11];
-   out_3056772812413117361[12] = state[12];
-   out_3056772812413117361[13] = state[13];
-   out_3056772812413117361[14] = state[14];
-   out_3056772812413117361[15] = state[15];
-   out_3056772812413117361[16] = state[16];
-   out_3056772812413117361[17] = state[17];
-   out_3056772812413117361[18] = state[18];
-   out_3056772812413117361[19] = state[19];
-   out_3056772812413117361[20] = state[20];
-   out_3056772812413117361[21] = state[21];
+void f_fun(double *state, double dt, double *out_9047640957774126431) {
+   out_9047640957774126431[0] = dt*state[7] + state[0];
+   out_9047640957774126431[1] = dt*state[8] + state[1];
+   out_9047640957774126431[2] = dt*state[9] + state[2];
+   out_9047640957774126431[3] = dt*(-0.5*state[4]*state[10] - 0.5*state[5]*state[11] - 0.5*state[6]*state[12]) + state[3];
+   out_9047640957774126431[4] = dt*(0.5*state[3]*state[10] + 0.5*state[5]*state[12] - 0.5*state[6]*state[11]) + state[4];
+   out_9047640957774126431[5] = dt*(0.5*state[3]*state[11] - 0.5*state[4]*state[12] + 0.5*state[6]*state[10]) + state[5];
+   out_9047640957774126431[6] = dt*(0.5*state[3]*state[12] + 0.5*state[4]*state[11] - 0.5*state[5]*state[10]) + state[6];
+   out_9047640957774126431[7] = dt*((2*state[3]*state[5] + 2*state[4]*state[6])*state[18] + (-2*state[3]*state[6] + 2*state[4]*state[5])*state[17] + (pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*state[16]) + state[7];
+   out_9047640957774126431[8] = dt*((-2*state[3]*state[4] + 2*state[5]*state[6])*state[18] + (2*state[3]*state[6] + 2*state[4]*state[5])*state[16] + (pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*state[17]) + state[8];
+   out_9047640957774126431[9] = dt*((2*state[3]*state[4] + 2*state[5]*state[6])*state[17] + (-2*state[3]*state[5] + 2*state[4]*state[6])*state[16] + (pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[18]) + state[9];
+   out_9047640957774126431[10] = state[10];
+   out_9047640957774126431[11] = state[11];
+   out_9047640957774126431[12] = state[12];
+   out_9047640957774126431[13] = state[13];
+   out_9047640957774126431[14] = state[14];
+   out_9047640957774126431[15] = state[15];
+   out_9047640957774126431[16] = state[16];
+   out_9047640957774126431[17] = state[17];
+   out_9047640957774126431[18] = state[18];
+   out_9047640957774126431[19] = state[19];
+   out_9047640957774126431[20] = state[20];
+   out_9047640957774126431[21] = state[21];
 }
-void F_fun(double *state, double dt, double *out_3001170024940786206) {
-   out_3001170024940786206[0] = 1;
-   out_3001170024940786206[1] = 0;
-   out_3001170024940786206[2] = 0;
-   out_3001170024940786206[3] = 0;
-   out_3001170024940786206[4] = 0;
-   out_3001170024940786206[5] = 0;
-   out_3001170024940786206[6] = dt;
-   out_3001170024940786206[7] = 0;
-   out_3001170024940786206[8] = 0;
-   out_3001170024940786206[9] = 0;
-   out_3001170024940786206[10] = 0;
-   out_3001170024940786206[11] = 0;
-   out_3001170024940786206[12] = 0;
-   out_3001170024940786206[13] = 0;
-   out_3001170024940786206[14] = 0;
-   out_3001170024940786206[15] = 0;
-   out_3001170024940786206[16] = 0;
-   out_3001170024940786206[17] = 0;
-   out_3001170024940786206[18] = 0;
-   out_3001170024940786206[19] = 0;
-   out_3001170024940786206[20] = 0;
-   out_3001170024940786206[21] = 0;
-   out_3001170024940786206[22] = 1;
-   out_3001170024940786206[23] = 0;
-   out_3001170024940786206[24] = 0;
-   out_3001170024940786206[25] = 0;
-   out_3001170024940786206[26] = 0;
-   out_3001170024940786206[27] = 0;
-   out_3001170024940786206[28] = dt;
-   out_3001170024940786206[29] = 0;
-   out_3001170024940786206[30] = 0;
-   out_3001170024940786206[31] = 0;
-   out_3001170024940786206[32] = 0;
-   out_3001170024940786206[33] = 0;
-   out_3001170024940786206[34] = 0;
-   out_3001170024940786206[35] = 0;
-   out_3001170024940786206[36] = 0;
-   out_3001170024940786206[37] = 0;
-   out_3001170024940786206[38] = 0;
-   out_3001170024940786206[39] = 0;
-   out_3001170024940786206[40] = 0;
-   out_3001170024940786206[41] = 0;
-   out_3001170024940786206[42] = 0;
-   out_3001170024940786206[43] = 0;
-   out_3001170024940786206[44] = 1;
-   out_3001170024940786206[45] = 0;
-   out_3001170024940786206[46] = 0;
-   out_3001170024940786206[47] = 0;
-   out_3001170024940786206[48] = 0;
-   out_3001170024940786206[49] = 0;
-   out_3001170024940786206[50] = dt;
-   out_3001170024940786206[51] = 0;
-   out_3001170024940786206[52] = 0;
-   out_3001170024940786206[53] = 0;
-   out_3001170024940786206[54] = 0;
-   out_3001170024940786206[55] = 0;
-   out_3001170024940786206[56] = 0;
-   out_3001170024940786206[57] = 0;
-   out_3001170024940786206[58] = 0;
-   out_3001170024940786206[59] = 0;
-   out_3001170024940786206[60] = 0;
-   out_3001170024940786206[61] = 0;
-   out_3001170024940786206[62] = 0;
-   out_3001170024940786206[63] = 0;
-   out_3001170024940786206[64] = 0;
-   out_3001170024940786206[65] = 0;
-   out_3001170024940786206[66] = 1;
-   out_3001170024940786206[67] = dt*((2*state[3]*state[4] + 2*state[5]*state[6])*state[11] + (-2*state[3]*state[5] + 2*state[4]*state[6])*state[10] + (pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[12]);
-   out_3001170024940786206[68] = dt*((2*state[3]*state[4] - 2*state[5]*state[6])*state[12] + (-2*state[3]*state[6] - 2*state[4]*state[5])*state[10] + (-pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[11]);
-   out_3001170024940786206[69] = 0;
-   out_3001170024940786206[70] = 0;
-   out_3001170024940786206[71] = 0;
-   out_3001170024940786206[72] = dt*(pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2));
-   out_3001170024940786206[73] = dt*(-2*state[3]*state[6] + 2*state[4]*state[5]);
-   out_3001170024940786206[74] = dt*(2*state[3]*state[5] + 2*state[4]*state[6]);
-   out_3001170024940786206[75] = 0;
-   out_3001170024940786206[76] = 0;
-   out_3001170024940786206[77] = 0;
-   out_3001170024940786206[78] = 0;
-   out_3001170024940786206[79] = 0;
-   out_3001170024940786206[80] = 0;
-   out_3001170024940786206[81] = 0;
-   out_3001170024940786206[82] = 0;
-   out_3001170024940786206[83] = 0;
-   out_3001170024940786206[84] = 0;
-   out_3001170024940786206[85] = 0;
-   out_3001170024940786206[86] = 0;
-   out_3001170024940786206[87] = dt*(-(2*state[3]*state[4] + 2*state[5]*state[6])*state[11] - (-2*state[3]*state[5] + 2*state[4]*state[6])*state[10] - (pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[12]);
-   out_3001170024940786206[88] = 1;
-   out_3001170024940786206[89] = dt*((2*state[3]*state[5] + 2*state[4]*state[6])*state[12] + (-2*state[3]*state[6] + 2*state[4]*state[5])*state[11] + (pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*state[10]);
-   out_3001170024940786206[90] = 0;
-   out_3001170024940786206[91] = 0;
-   out_3001170024940786206[92] = 0;
-   out_3001170024940786206[93] = dt*(2*state[3]*state[6] + 2*state[4]*state[5]);
-   out_3001170024940786206[94] = dt*(pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2));
-   out_3001170024940786206[95] = dt*(-2*state[3]*state[4] + 2*state[5]*state[6]);
-   out_3001170024940786206[96] = 0;
-   out_3001170024940786206[97] = 0;
-   out_3001170024940786206[98] = 0;
-   out_3001170024940786206[99] = 0;
-   out_3001170024940786206[100] = 0;
-   out_3001170024940786206[101] = 0;
-   out_3001170024940786206[102] = 0;
-   out_3001170024940786206[103] = 0;
-   out_3001170024940786206[104] = 0;
-   out_3001170024940786206[105] = 0;
-   out_3001170024940786206[106] = 0;
-   out_3001170024940786206[107] = 0;
-   out_3001170024940786206[108] = dt*((-2*state[3]*state[4] + 2*state[5]*state[6])*state[12] + (2*state[3]*state[6] + 2*state[4]*state[5])*state[10] + (pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*state[11]);
-   out_3001170024940786206[109] = dt*((-2*state[3]*state[5] - 2*state[4]*state[6])*state[12] + (2*state[3]*state[6] - 2*state[4]*state[5])*state[11] + (-pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) + pow(state[6], 2))*state[10]);
-   out_3001170024940786206[110] = 1;
-   out_3001170024940786206[111] = 0;
-   out_3001170024940786206[112] = 0;
-   out_3001170024940786206[113] = 0;
-   out_3001170024940786206[114] = dt*(-2*state[3]*state[5] + 2*state[4]*state[6]);
-   out_3001170024940786206[115] = dt*(2*state[3]*state[4] + 2*state[5]*state[6]);
-   out_3001170024940786206[116] = dt*(pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2));
-   out_3001170024940786206[117] = 0;
-   out_3001170024940786206[118] = 0;
-   out_3001170024940786206[119] = 0;
-   out_3001170024940786206[120] = 0;
-   out_3001170024940786206[121] = 0;
-   out_3001170024940786206[122] = 0;
-   out_3001170024940786206[123] = 0;
-   out_3001170024940786206[124] = 0;
-   out_3001170024940786206[125] = 0;
-   out_3001170024940786206[126] = 0;
-   out_3001170024940786206[127] = 0;
-   out_3001170024940786206[128] = 0;
-   out_3001170024940786206[129] = 0;
-   out_3001170024940786206[130] = dt*((2*state[3]*state[4] + 2*state[5]*state[6])*state[17] + (-2*state[3]*state[5] + 2*state[4]*state[6])*state[16] + (pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[18]);
-   out_3001170024940786206[131] = dt*((2*state[3]*state[4] - 2*state[5]*state[6])*state[18] + (-2*state[3]*state[6] - 2*state[4]*state[5])*state[16] + (-pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[17]);
-   out_3001170024940786206[132] = 1;
-   out_3001170024940786206[133] = 0;
-   out_3001170024940786206[134] = 0;
-   out_3001170024940786206[135] = 0;
-   out_3001170024940786206[136] = 0;
-   out_3001170024940786206[137] = 0;
-   out_3001170024940786206[138] = 0;
-   out_3001170024940786206[139] = 0;
-   out_3001170024940786206[140] = 0;
-   out_3001170024940786206[141] = dt*(pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2));
-   out_3001170024940786206[142] = dt*(-2*state[3]*state[6] + 2*state[4]*state[5]);
-   out_3001170024940786206[143] = dt*(2*state[3]*state[5] + 2*state[4]*state[6]);
-   out_3001170024940786206[144] = 0;
-   out_3001170024940786206[145] = 0;
-   out_3001170024940786206[146] = 0;
-   out_3001170024940786206[147] = 0;
-   out_3001170024940786206[148] = 0;
-   out_3001170024940786206[149] = 0;
-   out_3001170024940786206[150] = dt*(-(2*state[3]*state[4] + 2*state[5]*state[6])*state[17] - (-2*state[3]*state[5] + 2*state[4]*state[6])*state[16] - (pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[18]);
-   out_3001170024940786206[151] = 0;
-   out_3001170024940786206[152] = dt*((2*state[3]*state[5] + 2*state[4]*state[6])*state[18] + (-2*state[3]*state[6] + 2*state[4]*state[5])*state[17] + (pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*state[16]);
-   out_3001170024940786206[153] = 0;
-   out_3001170024940786206[154] = 1;
-   out_3001170024940786206[155] = 0;
-   out_3001170024940786206[156] = 0;
-   out_3001170024940786206[157] = 0;
-   out_3001170024940786206[158] = 0;
-   out_3001170024940786206[159] = 0;
-   out_3001170024940786206[160] = 0;
-   out_3001170024940786206[161] = 0;
-   out_3001170024940786206[162] = dt*(2*state[3]*state[6] + 2*state[4]*state[5]);
-   out_3001170024940786206[163] = dt*(pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2));
-   out_3001170024940786206[164] = dt*(-2*state[3]*state[4] + 2*state[5]*state[6]);
-   out_3001170024940786206[165] = 0;
-   out_3001170024940786206[166] = 0;
-   out_3001170024940786206[167] = 0;
-   out_3001170024940786206[168] = 0;
-   out_3001170024940786206[169] = 0;
-   out_3001170024940786206[170] = 0;
-   out_3001170024940786206[171] = dt*((-2*state[3]*state[4] + 2*state[5]*state[6])*state[18] + (2*state[3]*state[6] + 2*state[4]*state[5])*state[16] + (pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*state[17]);
-   out_3001170024940786206[172] = dt*((-2*state[3]*state[5] - 2*state[4]*state[6])*state[18] + (2*state[3]*state[6] - 2*state[4]*state[5])*state[17] + (-pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) + pow(state[6], 2))*state[16]);
-   out_3001170024940786206[173] = 0;
-   out_3001170024940786206[174] = 0;
-   out_3001170024940786206[175] = 0;
-   out_3001170024940786206[176] = 1;
-   out_3001170024940786206[177] = 0;
-   out_3001170024940786206[178] = 0;
-   out_3001170024940786206[179] = 0;
-   out_3001170024940786206[180] = 0;
-   out_3001170024940786206[181] = 0;
-   out_3001170024940786206[182] = 0;
-   out_3001170024940786206[183] = dt*(-2*state[3]*state[5] + 2*state[4]*state[6]);
-   out_3001170024940786206[184] = dt*(2*state[3]*state[4] + 2*state[5]*state[6]);
-   out_3001170024940786206[185] = dt*(pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2));
-   out_3001170024940786206[186] = 0;
-   out_3001170024940786206[187] = 0;
-   out_3001170024940786206[188] = 0;
-   out_3001170024940786206[189] = 0;
-   out_3001170024940786206[190] = 0;
-   out_3001170024940786206[191] = 0;
-   out_3001170024940786206[192] = 0;
-   out_3001170024940786206[193] = 0;
-   out_3001170024940786206[194] = 0;
-   out_3001170024940786206[195] = 0;
-   out_3001170024940786206[196] = 0;
-   out_3001170024940786206[197] = 0;
-   out_3001170024940786206[198] = 1;
-   out_3001170024940786206[199] = 0;
-   out_3001170024940786206[200] = 0;
-   out_3001170024940786206[201] = 0;
-   out_3001170024940786206[202] = 0;
-   out_3001170024940786206[203] = 0;
-   out_3001170024940786206[204] = 0;
-   out_3001170024940786206[205] = 0;
-   out_3001170024940786206[206] = 0;
-   out_3001170024940786206[207] = 0;
-   out_3001170024940786206[208] = 0;
-   out_3001170024940786206[209] = 0;
-   out_3001170024940786206[210] = 0;
-   out_3001170024940786206[211] = 0;
-   out_3001170024940786206[212] = 0;
-   out_3001170024940786206[213] = 0;
-   out_3001170024940786206[214] = 0;
-   out_3001170024940786206[215] = 0;
-   out_3001170024940786206[216] = 0;
-   out_3001170024940786206[217] = 0;
-   out_3001170024940786206[218] = 0;
-   out_3001170024940786206[219] = 0;
-   out_3001170024940786206[220] = 1;
-   out_3001170024940786206[221] = 0;
-   out_3001170024940786206[222] = 0;
-   out_3001170024940786206[223] = 0;
-   out_3001170024940786206[224] = 0;
-   out_3001170024940786206[225] = 0;
-   out_3001170024940786206[226] = 0;
-   out_3001170024940786206[227] = 0;
-   out_3001170024940786206[228] = 0;
-   out_3001170024940786206[229] = 0;
-   out_3001170024940786206[230] = 0;
-   out_3001170024940786206[231] = 0;
-   out_3001170024940786206[232] = 0;
-   out_3001170024940786206[233] = 0;
-   out_3001170024940786206[234] = 0;
-   out_3001170024940786206[235] = 0;
-   out_3001170024940786206[236] = 0;
-   out_3001170024940786206[237] = 0;
-   out_3001170024940786206[238] = 0;
-   out_3001170024940786206[239] = 0;
-   out_3001170024940786206[240] = 0;
-   out_3001170024940786206[241] = 0;
-   out_3001170024940786206[242] = 1;
-   out_3001170024940786206[243] = 0;
-   out_3001170024940786206[244] = 0;
-   out_3001170024940786206[245] = 0;
-   out_3001170024940786206[246] = 0;
-   out_3001170024940786206[247] = 0;
-   out_3001170024940786206[248] = 0;
-   out_3001170024940786206[249] = 0;
-   out_3001170024940786206[250] = 0;
-   out_3001170024940786206[251] = 0;
-   out_3001170024940786206[252] = 0;
-   out_3001170024940786206[253] = 0;
-   out_3001170024940786206[254] = 0;
-   out_3001170024940786206[255] = 0;
-   out_3001170024940786206[256] = 0;
-   out_3001170024940786206[257] = 0;
-   out_3001170024940786206[258] = 0;
-   out_3001170024940786206[259] = 0;
-   out_3001170024940786206[260] = 0;
-   out_3001170024940786206[261] = 0;
-   out_3001170024940786206[262] = 0;
-   out_3001170024940786206[263] = 0;
-   out_3001170024940786206[264] = 1;
-   out_3001170024940786206[265] = 0;
-   out_3001170024940786206[266] = 0;
-   out_3001170024940786206[267] = 0;
-   out_3001170024940786206[268] = 0;
-   out_3001170024940786206[269] = 0;
-   out_3001170024940786206[270] = 0;
-   out_3001170024940786206[271] = 0;
-   out_3001170024940786206[272] = 0;
-   out_3001170024940786206[273] = 0;
-   out_3001170024940786206[274] = 0;
-   out_3001170024940786206[275] = 0;
-   out_3001170024940786206[276] = 0;
-   out_3001170024940786206[277] = 0;
-   out_3001170024940786206[278] = 0;
-   out_3001170024940786206[279] = 0;
-   out_3001170024940786206[280] = 0;
-   out_3001170024940786206[281] = 0;
-   out_3001170024940786206[282] = 0;
-   out_3001170024940786206[283] = 0;
-   out_3001170024940786206[284] = 0;
-   out_3001170024940786206[285] = 0;
-   out_3001170024940786206[286] = 1;
-   out_3001170024940786206[287] = 0;
-   out_3001170024940786206[288] = 0;
-   out_3001170024940786206[289] = 0;
-   out_3001170024940786206[290] = 0;
-   out_3001170024940786206[291] = 0;
-   out_3001170024940786206[292] = 0;
-   out_3001170024940786206[293] = 0;
-   out_3001170024940786206[294] = 0;
-   out_3001170024940786206[295] = 0;
-   out_3001170024940786206[296] = 0;
-   out_3001170024940786206[297] = 0;
-   out_3001170024940786206[298] = 0;
-   out_3001170024940786206[299] = 0;
-   out_3001170024940786206[300] = 0;
-   out_3001170024940786206[301] = 0;
-   out_3001170024940786206[302] = 0;
-   out_3001170024940786206[303] = 0;
-   out_3001170024940786206[304] = 0;
-   out_3001170024940786206[305] = 0;
-   out_3001170024940786206[306] = 0;
-   out_3001170024940786206[307] = 0;
-   out_3001170024940786206[308] = 1;
-   out_3001170024940786206[309] = 0;
-   out_3001170024940786206[310] = 0;
-   out_3001170024940786206[311] = 0;
-   out_3001170024940786206[312] = 0;
-   out_3001170024940786206[313] = 0;
-   out_3001170024940786206[314] = 0;
-   out_3001170024940786206[315] = 0;
-   out_3001170024940786206[316] = 0;
-   out_3001170024940786206[317] = 0;
-   out_3001170024940786206[318] = 0;
-   out_3001170024940786206[319] = 0;
-   out_3001170024940786206[320] = 0;
-   out_3001170024940786206[321] = 0;
-   out_3001170024940786206[322] = 0;
-   out_3001170024940786206[323] = 0;
-   out_3001170024940786206[324] = 0;
-   out_3001170024940786206[325] = 0;
-   out_3001170024940786206[326] = 0;
-   out_3001170024940786206[327] = 0;
-   out_3001170024940786206[328] = 0;
-   out_3001170024940786206[329] = 0;
-   out_3001170024940786206[330] = 1;
-   out_3001170024940786206[331] = 0;
-   out_3001170024940786206[332] = 0;
-   out_3001170024940786206[333] = 0;
-   out_3001170024940786206[334] = 0;
-   out_3001170024940786206[335] = 0;
-   out_3001170024940786206[336] = 0;
-   out_3001170024940786206[337] = 0;
-   out_3001170024940786206[338] = 0;
-   out_3001170024940786206[339] = 0;
-   out_3001170024940786206[340] = 0;
-   out_3001170024940786206[341] = 0;
-   out_3001170024940786206[342] = 0;
-   out_3001170024940786206[343] = 0;
-   out_3001170024940786206[344] = 0;
-   out_3001170024940786206[345] = 0;
-   out_3001170024940786206[346] = 0;
-   out_3001170024940786206[347] = 0;
-   out_3001170024940786206[348] = 0;
-   out_3001170024940786206[349] = 0;
-   out_3001170024940786206[350] = 0;
-   out_3001170024940786206[351] = 0;
-   out_3001170024940786206[352] = 1;
-   out_3001170024940786206[353] = 0;
-   out_3001170024940786206[354] = 0;
-   out_3001170024940786206[355] = 0;
-   out_3001170024940786206[356] = 0;
-   out_3001170024940786206[357] = 0;
-   out_3001170024940786206[358] = 0;
-   out_3001170024940786206[359] = 0;
-   out_3001170024940786206[360] = 0;
-   out_3001170024940786206[361] = 0;
-   out_3001170024940786206[362] = 0;
-   out_3001170024940786206[363] = 0;
-   out_3001170024940786206[364] = 0;
-   out_3001170024940786206[365] = 0;
-   out_3001170024940786206[366] = 0;
-   out_3001170024940786206[367] = 0;
-   out_3001170024940786206[368] = 0;
-   out_3001170024940786206[369] = 0;
-   out_3001170024940786206[370] = 0;
-   out_3001170024940786206[371] = 0;
-   out_3001170024940786206[372] = 0;
-   out_3001170024940786206[373] = 0;
-   out_3001170024940786206[374] = 1;
-   out_3001170024940786206[375] = 0;
-   out_3001170024940786206[376] = 0;
-   out_3001170024940786206[377] = 0;
-   out_3001170024940786206[378] = 0;
-   out_3001170024940786206[379] = 0;
-   out_3001170024940786206[380] = 0;
-   out_3001170024940786206[381] = 0;
-   out_3001170024940786206[382] = 0;
-   out_3001170024940786206[383] = 0;
-   out_3001170024940786206[384] = 0;
-   out_3001170024940786206[385] = 0;
-   out_3001170024940786206[386] = 0;
-   out_3001170024940786206[387] = 0;
-   out_3001170024940786206[388] = 0;
-   out_3001170024940786206[389] = 0;
-   out_3001170024940786206[390] = 0;
-   out_3001170024940786206[391] = 0;
-   out_3001170024940786206[392] = 0;
-   out_3001170024940786206[393] = 0;
-   out_3001170024940786206[394] = 0;
-   out_3001170024940786206[395] = 0;
-   out_3001170024940786206[396] = 1;
-   out_3001170024940786206[397] = 0;
-   out_3001170024940786206[398] = 0;
-   out_3001170024940786206[399] = 0;
-   out_3001170024940786206[400] = 0;
-   out_3001170024940786206[401] = 0;
-   out_3001170024940786206[402] = 0;
-   out_3001170024940786206[403] = 0;
-   out_3001170024940786206[404] = 0;
-   out_3001170024940786206[405] = 0;
-   out_3001170024940786206[406] = 0;
-   out_3001170024940786206[407] = 0;
-   out_3001170024940786206[408] = 0;
-   out_3001170024940786206[409] = 0;
-   out_3001170024940786206[410] = 0;
-   out_3001170024940786206[411] = 0;
-   out_3001170024940786206[412] = 0;
-   out_3001170024940786206[413] = 0;
-   out_3001170024940786206[414] = 0;
-   out_3001170024940786206[415] = 0;
-   out_3001170024940786206[416] = 0;
-   out_3001170024940786206[417] = 0;
-   out_3001170024940786206[418] = 1;
-   out_3001170024940786206[419] = 0;
-   out_3001170024940786206[420] = 0;
-   out_3001170024940786206[421] = 0;
-   out_3001170024940786206[422] = 0;
-   out_3001170024940786206[423] = 0;
-   out_3001170024940786206[424] = 0;
-   out_3001170024940786206[425] = 0;
-   out_3001170024940786206[426] = 0;
-   out_3001170024940786206[427] = 0;
-   out_3001170024940786206[428] = 0;
-   out_3001170024940786206[429] = 0;
-   out_3001170024940786206[430] = 0;
-   out_3001170024940786206[431] = 0;
-   out_3001170024940786206[432] = 0;
-   out_3001170024940786206[433] = 0;
-   out_3001170024940786206[434] = 0;
-   out_3001170024940786206[435] = 0;
-   out_3001170024940786206[436] = 0;
-   out_3001170024940786206[437] = 0;
-   out_3001170024940786206[438] = 0;
-   out_3001170024940786206[439] = 0;
-   out_3001170024940786206[440] = 1;
+void F_fun(double *state, double dt, double *out_4752414459068816126) {
+   out_4752414459068816126[0] = 1;
+   out_4752414459068816126[1] = 0;
+   out_4752414459068816126[2] = 0;
+   out_4752414459068816126[3] = 0;
+   out_4752414459068816126[4] = 0;
+   out_4752414459068816126[5] = 0;
+   out_4752414459068816126[6] = dt;
+   out_4752414459068816126[7] = 0;
+   out_4752414459068816126[8] = 0;
+   out_4752414459068816126[9] = 0;
+   out_4752414459068816126[10] = 0;
+   out_4752414459068816126[11] = 0;
+   out_4752414459068816126[12] = 0;
+   out_4752414459068816126[13] = 0;
+   out_4752414459068816126[14] = 0;
+   out_4752414459068816126[15] = 0;
+   out_4752414459068816126[16] = 0;
+   out_4752414459068816126[17] = 0;
+   out_4752414459068816126[18] = 0;
+   out_4752414459068816126[19] = 0;
+   out_4752414459068816126[20] = 0;
+   out_4752414459068816126[21] = 0;
+   out_4752414459068816126[22] = 1;
+   out_4752414459068816126[23] = 0;
+   out_4752414459068816126[24] = 0;
+   out_4752414459068816126[25] = 0;
+   out_4752414459068816126[26] = 0;
+   out_4752414459068816126[27] = 0;
+   out_4752414459068816126[28] = dt;
+   out_4752414459068816126[29] = 0;
+   out_4752414459068816126[30] = 0;
+   out_4752414459068816126[31] = 0;
+   out_4752414459068816126[32] = 0;
+   out_4752414459068816126[33] = 0;
+   out_4752414459068816126[34] = 0;
+   out_4752414459068816126[35] = 0;
+   out_4752414459068816126[36] = 0;
+   out_4752414459068816126[37] = 0;
+   out_4752414459068816126[38] = 0;
+   out_4752414459068816126[39] = 0;
+   out_4752414459068816126[40] = 0;
+   out_4752414459068816126[41] = 0;
+   out_4752414459068816126[42] = 0;
+   out_4752414459068816126[43] = 0;
+   out_4752414459068816126[44] = 1;
+   out_4752414459068816126[45] = 0;
+   out_4752414459068816126[46] = 0;
+   out_4752414459068816126[47] = 0;
+   out_4752414459068816126[48] = 0;
+   out_4752414459068816126[49] = 0;
+   out_4752414459068816126[50] = dt;
+   out_4752414459068816126[51] = 0;
+   out_4752414459068816126[52] = 0;
+   out_4752414459068816126[53] = 0;
+   out_4752414459068816126[54] = 0;
+   out_4752414459068816126[55] = 0;
+   out_4752414459068816126[56] = 0;
+   out_4752414459068816126[57] = 0;
+   out_4752414459068816126[58] = 0;
+   out_4752414459068816126[59] = 0;
+   out_4752414459068816126[60] = 0;
+   out_4752414459068816126[61] = 0;
+   out_4752414459068816126[62] = 0;
+   out_4752414459068816126[63] = 0;
+   out_4752414459068816126[64] = 0;
+   out_4752414459068816126[65] = 0;
+   out_4752414459068816126[66] = 1;
+   out_4752414459068816126[67] = dt*((2*state[3]*state[4] + 2*state[5]*state[6])*state[11] + (-2*state[3]*state[5] + 2*state[4]*state[6])*state[10] + (pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[12]);
+   out_4752414459068816126[68] = dt*((2*state[3]*state[4] - 2*state[5]*state[6])*state[12] + (-2*state[3]*state[6] - 2*state[4]*state[5])*state[10] + (-pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[11]);
+   out_4752414459068816126[69] = 0;
+   out_4752414459068816126[70] = 0;
+   out_4752414459068816126[71] = 0;
+   out_4752414459068816126[72] = dt*(pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2));
+   out_4752414459068816126[73] = dt*(-2*state[3]*state[6] + 2*state[4]*state[5]);
+   out_4752414459068816126[74] = dt*(2*state[3]*state[5] + 2*state[4]*state[6]);
+   out_4752414459068816126[75] = 0;
+   out_4752414459068816126[76] = 0;
+   out_4752414459068816126[77] = 0;
+   out_4752414459068816126[78] = 0;
+   out_4752414459068816126[79] = 0;
+   out_4752414459068816126[80] = 0;
+   out_4752414459068816126[81] = 0;
+   out_4752414459068816126[82] = 0;
+   out_4752414459068816126[83] = 0;
+   out_4752414459068816126[84] = 0;
+   out_4752414459068816126[85] = 0;
+   out_4752414459068816126[86] = 0;
+   out_4752414459068816126[87] = dt*(-(2*state[3]*state[4] + 2*state[5]*state[6])*state[11] - (-2*state[3]*state[5] + 2*state[4]*state[6])*state[10] - (pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[12]);
+   out_4752414459068816126[88] = 1;
+   out_4752414459068816126[89] = dt*((2*state[3]*state[5] + 2*state[4]*state[6])*state[12] + (-2*state[3]*state[6] + 2*state[4]*state[5])*state[11] + (pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*state[10]);
+   out_4752414459068816126[90] = 0;
+   out_4752414459068816126[91] = 0;
+   out_4752414459068816126[92] = 0;
+   out_4752414459068816126[93] = dt*(2*state[3]*state[6] + 2*state[4]*state[5]);
+   out_4752414459068816126[94] = dt*(pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2));
+   out_4752414459068816126[95] = dt*(-2*state[3]*state[4] + 2*state[5]*state[6]);
+   out_4752414459068816126[96] = 0;
+   out_4752414459068816126[97] = 0;
+   out_4752414459068816126[98] = 0;
+   out_4752414459068816126[99] = 0;
+   out_4752414459068816126[100] = 0;
+   out_4752414459068816126[101] = 0;
+   out_4752414459068816126[102] = 0;
+   out_4752414459068816126[103] = 0;
+   out_4752414459068816126[104] = 0;
+   out_4752414459068816126[105] = 0;
+   out_4752414459068816126[106] = 0;
+   out_4752414459068816126[107] = 0;
+   out_4752414459068816126[108] = dt*((-2*state[3]*state[4] + 2*state[5]*state[6])*state[12] + (2*state[3]*state[6] + 2*state[4]*state[5])*state[10] + (pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*state[11]);
+   out_4752414459068816126[109] = dt*((-2*state[3]*state[5] - 2*state[4]*state[6])*state[12] + (2*state[3]*state[6] - 2*state[4]*state[5])*state[11] + (-pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) + pow(state[6], 2))*state[10]);
+   out_4752414459068816126[110] = 1;
+   out_4752414459068816126[111] = 0;
+   out_4752414459068816126[112] = 0;
+   out_4752414459068816126[113] = 0;
+   out_4752414459068816126[114] = dt*(-2*state[3]*state[5] + 2*state[4]*state[6]);
+   out_4752414459068816126[115] = dt*(2*state[3]*state[4] + 2*state[5]*state[6]);
+   out_4752414459068816126[116] = dt*(pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2));
+   out_4752414459068816126[117] = 0;
+   out_4752414459068816126[118] = 0;
+   out_4752414459068816126[119] = 0;
+   out_4752414459068816126[120] = 0;
+   out_4752414459068816126[121] = 0;
+   out_4752414459068816126[122] = 0;
+   out_4752414459068816126[123] = 0;
+   out_4752414459068816126[124] = 0;
+   out_4752414459068816126[125] = 0;
+   out_4752414459068816126[126] = 0;
+   out_4752414459068816126[127] = 0;
+   out_4752414459068816126[128] = 0;
+   out_4752414459068816126[129] = 0;
+   out_4752414459068816126[130] = dt*((2*state[3]*state[4] + 2*state[5]*state[6])*state[17] + (-2*state[3]*state[5] + 2*state[4]*state[6])*state[16] + (pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[18]);
+   out_4752414459068816126[131] = dt*((2*state[3]*state[4] - 2*state[5]*state[6])*state[18] + (-2*state[3]*state[6] - 2*state[4]*state[5])*state[16] + (-pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[17]);
+   out_4752414459068816126[132] = 1;
+   out_4752414459068816126[133] = 0;
+   out_4752414459068816126[134] = 0;
+   out_4752414459068816126[135] = 0;
+   out_4752414459068816126[136] = 0;
+   out_4752414459068816126[137] = 0;
+   out_4752414459068816126[138] = 0;
+   out_4752414459068816126[139] = 0;
+   out_4752414459068816126[140] = 0;
+   out_4752414459068816126[141] = dt*(pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2));
+   out_4752414459068816126[142] = dt*(-2*state[3]*state[6] + 2*state[4]*state[5]);
+   out_4752414459068816126[143] = dt*(2*state[3]*state[5] + 2*state[4]*state[6]);
+   out_4752414459068816126[144] = 0;
+   out_4752414459068816126[145] = 0;
+   out_4752414459068816126[146] = 0;
+   out_4752414459068816126[147] = 0;
+   out_4752414459068816126[148] = 0;
+   out_4752414459068816126[149] = 0;
+   out_4752414459068816126[150] = dt*(-(2*state[3]*state[4] + 2*state[5]*state[6])*state[17] - (-2*state[3]*state[5] + 2*state[4]*state[6])*state[16] - (pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[18]);
+   out_4752414459068816126[151] = 0;
+   out_4752414459068816126[152] = dt*((2*state[3]*state[5] + 2*state[4]*state[6])*state[18] + (-2*state[3]*state[6] + 2*state[4]*state[5])*state[17] + (pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*state[16]);
+   out_4752414459068816126[153] = 0;
+   out_4752414459068816126[154] = 1;
+   out_4752414459068816126[155] = 0;
+   out_4752414459068816126[156] = 0;
+   out_4752414459068816126[157] = 0;
+   out_4752414459068816126[158] = 0;
+   out_4752414459068816126[159] = 0;
+   out_4752414459068816126[160] = 0;
+   out_4752414459068816126[161] = 0;
+   out_4752414459068816126[162] = dt*(2*state[3]*state[6] + 2*state[4]*state[5]);
+   out_4752414459068816126[163] = dt*(pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2));
+   out_4752414459068816126[164] = dt*(-2*state[3]*state[4] + 2*state[5]*state[6]);
+   out_4752414459068816126[165] = 0;
+   out_4752414459068816126[166] = 0;
+   out_4752414459068816126[167] = 0;
+   out_4752414459068816126[168] = 0;
+   out_4752414459068816126[169] = 0;
+   out_4752414459068816126[170] = 0;
+   out_4752414459068816126[171] = dt*((-2*state[3]*state[4] + 2*state[5]*state[6])*state[18] + (2*state[3]*state[6] + 2*state[4]*state[5])*state[16] + (pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*state[17]);
+   out_4752414459068816126[172] = dt*((-2*state[3]*state[5] - 2*state[4]*state[6])*state[18] + (2*state[3]*state[6] - 2*state[4]*state[5])*state[17] + (-pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) + pow(state[6], 2))*state[16]);
+   out_4752414459068816126[173] = 0;
+   out_4752414459068816126[174] = 0;
+   out_4752414459068816126[175] = 0;
+   out_4752414459068816126[176] = 1;
+   out_4752414459068816126[177] = 0;
+   out_4752414459068816126[178] = 0;
+   out_4752414459068816126[179] = 0;
+   out_4752414459068816126[180] = 0;
+   out_4752414459068816126[181] = 0;
+   out_4752414459068816126[182] = 0;
+   out_4752414459068816126[183] = dt*(-2*state[3]*state[5] + 2*state[4]*state[6]);
+   out_4752414459068816126[184] = dt*(2*state[3]*state[4] + 2*state[5]*state[6]);
+   out_4752414459068816126[185] = dt*(pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2));
+   out_4752414459068816126[186] = 0;
+   out_4752414459068816126[187] = 0;
+   out_4752414459068816126[188] = 0;
+   out_4752414459068816126[189] = 0;
+   out_4752414459068816126[190] = 0;
+   out_4752414459068816126[191] = 0;
+   out_4752414459068816126[192] = 0;
+   out_4752414459068816126[193] = 0;
+   out_4752414459068816126[194] = 0;
+   out_4752414459068816126[195] = 0;
+   out_4752414459068816126[196] = 0;
+   out_4752414459068816126[197] = 0;
+   out_4752414459068816126[198] = 1;
+   out_4752414459068816126[199] = 0;
+   out_4752414459068816126[200] = 0;
+   out_4752414459068816126[201] = 0;
+   out_4752414459068816126[202] = 0;
+   out_4752414459068816126[203] = 0;
+   out_4752414459068816126[204] = 0;
+   out_4752414459068816126[205] = 0;
+   out_4752414459068816126[206] = 0;
+   out_4752414459068816126[207] = 0;
+   out_4752414459068816126[208] = 0;
+   out_4752414459068816126[209] = 0;
+   out_4752414459068816126[210] = 0;
+   out_4752414459068816126[211] = 0;
+   out_4752414459068816126[212] = 0;
+   out_4752414459068816126[213] = 0;
+   out_4752414459068816126[214] = 0;
+   out_4752414459068816126[215] = 0;
+   out_4752414459068816126[216] = 0;
+   out_4752414459068816126[217] = 0;
+   out_4752414459068816126[218] = 0;
+   out_4752414459068816126[219] = 0;
+   out_4752414459068816126[220] = 1;
+   out_4752414459068816126[221] = 0;
+   out_4752414459068816126[222] = 0;
+   out_4752414459068816126[223] = 0;
+   out_4752414459068816126[224] = 0;
+   out_4752414459068816126[225] = 0;
+   out_4752414459068816126[226] = 0;
+   out_4752414459068816126[227] = 0;
+   out_4752414459068816126[228] = 0;
+   out_4752414459068816126[229] = 0;
+   out_4752414459068816126[230] = 0;
+   out_4752414459068816126[231] = 0;
+   out_4752414459068816126[232] = 0;
+   out_4752414459068816126[233] = 0;
+   out_4752414459068816126[234] = 0;
+   out_4752414459068816126[235] = 0;
+   out_4752414459068816126[236] = 0;
+   out_4752414459068816126[237] = 0;
+   out_4752414459068816126[238] = 0;
+   out_4752414459068816126[239] = 0;
+   out_4752414459068816126[240] = 0;
+   out_4752414459068816126[241] = 0;
+   out_4752414459068816126[242] = 1;
+   out_4752414459068816126[243] = 0;
+   out_4752414459068816126[244] = 0;
+   out_4752414459068816126[245] = 0;
+   out_4752414459068816126[246] = 0;
+   out_4752414459068816126[247] = 0;
+   out_4752414459068816126[248] = 0;
+   out_4752414459068816126[249] = 0;
+   out_4752414459068816126[250] = 0;
+   out_4752414459068816126[251] = 0;
+   out_4752414459068816126[252] = 0;
+   out_4752414459068816126[253] = 0;
+   out_4752414459068816126[254] = 0;
+   out_4752414459068816126[255] = 0;
+   out_4752414459068816126[256] = 0;
+   out_4752414459068816126[257] = 0;
+   out_4752414459068816126[258] = 0;
+   out_4752414459068816126[259] = 0;
+   out_4752414459068816126[260] = 0;
+   out_4752414459068816126[261] = 0;
+   out_4752414459068816126[262] = 0;
+   out_4752414459068816126[263] = 0;
+   out_4752414459068816126[264] = 1;
+   out_4752414459068816126[265] = 0;
+   out_4752414459068816126[266] = 0;
+   out_4752414459068816126[267] = 0;
+   out_4752414459068816126[268] = 0;
+   out_4752414459068816126[269] = 0;
+   out_4752414459068816126[270] = 0;
+   out_4752414459068816126[271] = 0;
+   out_4752414459068816126[272] = 0;
+   out_4752414459068816126[273] = 0;
+   out_4752414459068816126[274] = 0;
+   out_4752414459068816126[275] = 0;
+   out_4752414459068816126[276] = 0;
+   out_4752414459068816126[277] = 0;
+   out_4752414459068816126[278] = 0;
+   out_4752414459068816126[279] = 0;
+   out_4752414459068816126[280] = 0;
+   out_4752414459068816126[281] = 0;
+   out_4752414459068816126[282] = 0;
+   out_4752414459068816126[283] = 0;
+   out_4752414459068816126[284] = 0;
+   out_4752414459068816126[285] = 0;
+   out_4752414459068816126[286] = 1;
+   out_4752414459068816126[287] = 0;
+   out_4752414459068816126[288] = 0;
+   out_4752414459068816126[289] = 0;
+   out_4752414459068816126[290] = 0;
+   out_4752414459068816126[291] = 0;
+   out_4752414459068816126[292] = 0;
+   out_4752414459068816126[293] = 0;
+   out_4752414459068816126[294] = 0;
+   out_4752414459068816126[295] = 0;
+   out_4752414459068816126[296] = 0;
+   out_4752414459068816126[297] = 0;
+   out_4752414459068816126[298] = 0;
+   out_4752414459068816126[299] = 0;
+   out_4752414459068816126[300] = 0;
+   out_4752414459068816126[301] = 0;
+   out_4752414459068816126[302] = 0;
+   out_4752414459068816126[303] = 0;
+   out_4752414459068816126[304] = 0;
+   out_4752414459068816126[305] = 0;
+   out_4752414459068816126[306] = 0;
+   out_4752414459068816126[307] = 0;
+   out_4752414459068816126[308] = 1;
+   out_4752414459068816126[309] = 0;
+   out_4752414459068816126[310] = 0;
+   out_4752414459068816126[311] = 0;
+   out_4752414459068816126[312] = 0;
+   out_4752414459068816126[313] = 0;
+   out_4752414459068816126[314] = 0;
+   out_4752414459068816126[315] = 0;
+   out_4752414459068816126[316] = 0;
+   out_4752414459068816126[317] = 0;
+   out_4752414459068816126[318] = 0;
+   out_4752414459068816126[319] = 0;
+   out_4752414459068816126[320] = 0;
+   out_4752414459068816126[321] = 0;
+   out_4752414459068816126[322] = 0;
+   out_4752414459068816126[323] = 0;
+   out_4752414459068816126[324] = 0;
+   out_4752414459068816126[325] = 0;
+   out_4752414459068816126[326] = 0;
+   out_4752414459068816126[327] = 0;
+   out_4752414459068816126[328] = 0;
+   out_4752414459068816126[329] = 0;
+   out_4752414459068816126[330] = 1;
+   out_4752414459068816126[331] = 0;
+   out_4752414459068816126[332] = 0;
+   out_4752414459068816126[333] = 0;
+   out_4752414459068816126[334] = 0;
+   out_4752414459068816126[335] = 0;
+   out_4752414459068816126[336] = 0;
+   out_4752414459068816126[337] = 0;
+   out_4752414459068816126[338] = 0;
+   out_4752414459068816126[339] = 0;
+   out_4752414459068816126[340] = 0;
+   out_4752414459068816126[341] = 0;
+   out_4752414459068816126[342] = 0;
+   out_4752414459068816126[343] = 0;
+   out_4752414459068816126[344] = 0;
+   out_4752414459068816126[345] = 0;
+   out_4752414459068816126[346] = 0;
+   out_4752414459068816126[347] = 0;
+   out_4752414459068816126[348] = 0;
+   out_4752414459068816126[349] = 0;
+   out_4752414459068816126[350] = 0;
+   out_4752414459068816126[351] = 0;
+   out_4752414459068816126[352] = 1;
+   out_4752414459068816126[353] = 0;
+   out_4752414459068816126[354] = 0;
+   out_4752414459068816126[355] = 0;
+   out_4752414459068816126[356] = 0;
+   out_4752414459068816126[357] = 0;
+   out_4752414459068816126[358] = 0;
+   out_4752414459068816126[359] = 0;
+   out_4752414459068816126[360] = 0;
+   out_4752414459068816126[361] = 0;
+   out_4752414459068816126[362] = 0;
+   out_4752414459068816126[363] = 0;
+   out_4752414459068816126[364] = 0;
+   out_4752414459068816126[365] = 0;
+   out_4752414459068816126[366] = 0;
+   out_4752414459068816126[367] = 0;
+   out_4752414459068816126[368] = 0;
+   out_4752414459068816126[369] = 0;
+   out_4752414459068816126[370] = 0;
+   out_4752414459068816126[371] = 0;
+   out_4752414459068816126[372] = 0;
+   out_4752414459068816126[373] = 0;
+   out_4752414459068816126[374] = 1;
+   out_4752414459068816126[375] = 0;
+   out_4752414459068816126[376] = 0;
+   out_4752414459068816126[377] = 0;
+   out_4752414459068816126[378] = 0;
+   out_4752414459068816126[379] = 0;
+   out_4752414459068816126[380] = 0;
+   out_4752414459068816126[381] = 0;
+   out_4752414459068816126[382] = 0;
+   out_4752414459068816126[383] = 0;
+   out_4752414459068816126[384] = 0;
+   out_4752414459068816126[385] = 0;
+   out_4752414459068816126[386] = 0;
+   out_4752414459068816126[387] = 0;
+   out_4752414459068816126[388] = 0;
+   out_4752414459068816126[389] = 0;
+   out_4752414459068816126[390] = 0;
+   out_4752414459068816126[391] = 0;
+   out_4752414459068816126[392] = 0;
+   out_4752414459068816126[393] = 0;
+   out_4752414459068816126[394] = 0;
+   out_4752414459068816126[395] = 0;
+   out_4752414459068816126[396] = 1;
+   out_4752414459068816126[397] = 0;
+   out_4752414459068816126[398] = 0;
+   out_4752414459068816126[399] = 0;
+   out_4752414459068816126[400] = 0;
+   out_4752414459068816126[401] = 0;
+   out_4752414459068816126[402] = 0;
+   out_4752414459068816126[403] = 0;
+   out_4752414459068816126[404] = 0;
+   out_4752414459068816126[405] = 0;
+   out_4752414459068816126[406] = 0;
+   out_4752414459068816126[407] = 0;
+   out_4752414459068816126[408] = 0;
+   out_4752414459068816126[409] = 0;
+   out_4752414459068816126[410] = 0;
+   out_4752414459068816126[411] = 0;
+   out_4752414459068816126[412] = 0;
+   out_4752414459068816126[413] = 0;
+   out_4752414459068816126[414] = 0;
+   out_4752414459068816126[415] = 0;
+   out_4752414459068816126[416] = 0;
+   out_4752414459068816126[417] = 0;
+   out_4752414459068816126[418] = 1;
+   out_4752414459068816126[419] = 0;
+   out_4752414459068816126[420] = 0;
+   out_4752414459068816126[421] = 0;
+   out_4752414459068816126[422] = 0;
+   out_4752414459068816126[423] = 0;
+   out_4752414459068816126[424] = 0;
+   out_4752414459068816126[425] = 0;
+   out_4752414459068816126[426] = 0;
+   out_4752414459068816126[427] = 0;
+   out_4752414459068816126[428] = 0;
+   out_4752414459068816126[429] = 0;
+   out_4752414459068816126[430] = 0;
+   out_4752414459068816126[431] = 0;
+   out_4752414459068816126[432] = 0;
+   out_4752414459068816126[433] = 0;
+   out_4752414459068816126[434] = 0;
+   out_4752414459068816126[435] = 0;
+   out_4752414459068816126[436] = 0;
+   out_4752414459068816126[437] = 0;
+   out_4752414459068816126[438] = 0;
+   out_4752414459068816126[439] = 0;
+   out_4752414459068816126[440] = 1;
 }
-void h_4(double *state, double *unused, double *out_4623444193655221191) {
-   out_4623444193655221191[0] = state[10] + state[13];
-   out_4623444193655221191[1] = state[11] + state[14];
-   out_4623444193655221191[2] = state[12] + state[15];
+void h_4(double *state, double *unused, double *out_1938047718740512528) {
+   out_1938047718740512528[0] = state[10] + state[13];
+   out_1938047718740512528[1] = state[11] + state[14];
+   out_1938047718740512528[2] = state[12] + state[15];
 }
-void H_4(double *state, double *unused, double *out_2603623762087390332) {
-   out_2603623762087390332[0] = 0;
-   out_2603623762087390332[1] = 0;
-   out_2603623762087390332[2] = 0;
-   out_2603623762087390332[3] = 0;
-   out_2603623762087390332[4] = 0;
-   out_2603623762087390332[5] = 0;
-   out_2603623762087390332[6] = 0;
-   out_2603623762087390332[7] = 0;
-   out_2603623762087390332[8] = 0;
-   out_2603623762087390332[9] = 0;
-   out_2603623762087390332[10] = 1;
-   out_2603623762087390332[11] = 0;
-   out_2603623762087390332[12] = 0;
-   out_2603623762087390332[13] = 1;
-   out_2603623762087390332[14] = 0;
-   out_2603623762087390332[15] = 0;
-   out_2603623762087390332[16] = 0;
-   out_2603623762087390332[17] = 0;
-   out_2603623762087390332[18] = 0;
-   out_2603623762087390332[19] = 0;
-   out_2603623762087390332[20] = 0;
-   out_2603623762087390332[21] = 0;
-   out_2603623762087390332[22] = 0;
-   out_2603623762087390332[23] = 0;
-   out_2603623762087390332[24] = 0;
-   out_2603623762087390332[25] = 0;
-   out_2603623762087390332[26] = 0;
-   out_2603623762087390332[27] = 0;
-   out_2603623762087390332[28] = 0;
-   out_2603623762087390332[29] = 0;
-   out_2603623762087390332[30] = 0;
-   out_2603623762087390332[31] = 0;
-   out_2603623762087390332[32] = 0;
-   out_2603623762087390332[33] = 1;
-   out_2603623762087390332[34] = 0;
-   out_2603623762087390332[35] = 0;
-   out_2603623762087390332[36] = 1;
-   out_2603623762087390332[37] = 0;
-   out_2603623762087390332[38] = 0;
-   out_2603623762087390332[39] = 0;
-   out_2603623762087390332[40] = 0;
-   out_2603623762087390332[41] = 0;
-   out_2603623762087390332[42] = 0;
-   out_2603623762087390332[43] = 0;
-   out_2603623762087390332[44] = 0;
-   out_2603623762087390332[45] = 0;
-   out_2603623762087390332[46] = 0;
-   out_2603623762087390332[47] = 0;
-   out_2603623762087390332[48] = 0;
-   out_2603623762087390332[49] = 0;
-   out_2603623762087390332[50] = 0;
-   out_2603623762087390332[51] = 0;
-   out_2603623762087390332[52] = 0;
-   out_2603623762087390332[53] = 0;
-   out_2603623762087390332[54] = 0;
-   out_2603623762087390332[55] = 0;
-   out_2603623762087390332[56] = 1;
-   out_2603623762087390332[57] = 0;
-   out_2603623762087390332[58] = 0;
-   out_2603623762087390332[59] = 1;
-   out_2603623762087390332[60] = 0;
-   out_2603623762087390332[61] = 0;
-   out_2603623762087390332[62] = 0;
-   out_2603623762087390332[63] = 0;
-   out_2603623762087390332[64] = 0;
-   out_2603623762087390332[65] = 0;
+void H_4(double *state, double *unused, double *out_8437989887064667391) {
+   out_8437989887064667391[0] = 0;
+   out_8437989887064667391[1] = 0;
+   out_8437989887064667391[2] = 0;
+   out_8437989887064667391[3] = 0;
+   out_8437989887064667391[4] = 0;
+   out_8437989887064667391[5] = 0;
+   out_8437989887064667391[6] = 0;
+   out_8437989887064667391[7] = 0;
+   out_8437989887064667391[8] = 0;
+   out_8437989887064667391[9] = 0;
+   out_8437989887064667391[10] = 1;
+   out_8437989887064667391[11] = 0;
+   out_8437989887064667391[12] = 0;
+   out_8437989887064667391[13] = 1;
+   out_8437989887064667391[14] = 0;
+   out_8437989887064667391[15] = 0;
+   out_8437989887064667391[16] = 0;
+   out_8437989887064667391[17] = 0;
+   out_8437989887064667391[18] = 0;
+   out_8437989887064667391[19] = 0;
+   out_8437989887064667391[20] = 0;
+   out_8437989887064667391[21] = 0;
+   out_8437989887064667391[22] = 0;
+   out_8437989887064667391[23] = 0;
+   out_8437989887064667391[24] = 0;
+   out_8437989887064667391[25] = 0;
+   out_8437989887064667391[26] = 0;
+   out_8437989887064667391[27] = 0;
+   out_8437989887064667391[28] = 0;
+   out_8437989887064667391[29] = 0;
+   out_8437989887064667391[30] = 0;
+   out_8437989887064667391[31] = 0;
+   out_8437989887064667391[32] = 0;
+   out_8437989887064667391[33] = 1;
+   out_8437989887064667391[34] = 0;
+   out_8437989887064667391[35] = 0;
+   out_8437989887064667391[36] = 1;
+   out_8437989887064667391[37] = 0;
+   out_8437989887064667391[38] = 0;
+   out_8437989887064667391[39] = 0;
+   out_8437989887064667391[40] = 0;
+   out_8437989887064667391[41] = 0;
+   out_8437989887064667391[42] = 0;
+   out_8437989887064667391[43] = 0;
+   out_8437989887064667391[44] = 0;
+   out_8437989887064667391[45] = 0;
+   out_8437989887064667391[46] = 0;
+   out_8437989887064667391[47] = 0;
+   out_8437989887064667391[48] = 0;
+   out_8437989887064667391[49] = 0;
+   out_8437989887064667391[50] = 0;
+   out_8437989887064667391[51] = 0;
+   out_8437989887064667391[52] = 0;
+   out_8437989887064667391[53] = 0;
+   out_8437989887064667391[54] = 0;
+   out_8437989887064667391[55] = 0;
+   out_8437989887064667391[56] = 1;
+   out_8437989887064667391[57] = 0;
+   out_8437989887064667391[58] = 0;
+   out_8437989887064667391[59] = 1;
+   out_8437989887064667391[60] = 0;
+   out_8437989887064667391[61] = 0;
+   out_8437989887064667391[62] = 0;
+   out_8437989887064667391[63] = 0;
+   out_8437989887064667391[64] = 0;
+   out_8437989887064667391[65] = 0;
 }
-void h_9(double *state, double *unused, double *out_4168973980757166041) {
-   out_4168973980757166041[0] = state[10];
-   out_4168973980757166041[1] = state[11];
-   out_4168973980757166041[2] = state[12];
+void h_9(double *state, double *unused, double *out_2016376091952434025) {
+   out_2016376091952434025[0] = state[10];
+   out_2016376091952434025[1] = state[11];
+   out_2016376091952434025[2] = state[12];
 }
-void H_9(double *state, double *unused, double *out_2362434115457799687) {
-   out_2362434115457799687[0] = 0;
-   out_2362434115457799687[1] = 0;
-   out_2362434115457799687[2] = 0;
-   out_2362434115457799687[3] = 0;
-   out_2362434115457799687[4] = 0;
-   out_2362434115457799687[5] = 0;
-   out_2362434115457799687[6] = 0;
-   out_2362434115457799687[7] = 0;
-   out_2362434115457799687[8] = 0;
-   out_2362434115457799687[9] = 0;
-   out_2362434115457799687[10] = 1;
-   out_2362434115457799687[11] = 0;
-   out_2362434115457799687[12] = 0;
-   out_2362434115457799687[13] = 0;
-   out_2362434115457799687[14] = 0;
-   out_2362434115457799687[15] = 0;
-   out_2362434115457799687[16] = 0;
-   out_2362434115457799687[17] = 0;
-   out_2362434115457799687[18] = 0;
-   out_2362434115457799687[19] = 0;
-   out_2362434115457799687[20] = 0;
-   out_2362434115457799687[21] = 0;
-   out_2362434115457799687[22] = 0;
-   out_2362434115457799687[23] = 0;
-   out_2362434115457799687[24] = 0;
-   out_2362434115457799687[25] = 0;
-   out_2362434115457799687[26] = 0;
-   out_2362434115457799687[27] = 0;
-   out_2362434115457799687[28] = 0;
-   out_2362434115457799687[29] = 0;
-   out_2362434115457799687[30] = 0;
-   out_2362434115457799687[31] = 0;
-   out_2362434115457799687[32] = 0;
-   out_2362434115457799687[33] = 1;
-   out_2362434115457799687[34] = 0;
-   out_2362434115457799687[35] = 0;
-   out_2362434115457799687[36] = 0;
-   out_2362434115457799687[37] = 0;
-   out_2362434115457799687[38] = 0;
-   out_2362434115457799687[39] = 0;
-   out_2362434115457799687[40] = 0;
-   out_2362434115457799687[41] = 0;
-   out_2362434115457799687[42] = 0;
-   out_2362434115457799687[43] = 0;
-   out_2362434115457799687[44] = 0;
-   out_2362434115457799687[45] = 0;
-   out_2362434115457799687[46] = 0;
-   out_2362434115457799687[47] = 0;
-   out_2362434115457799687[48] = 0;
-   out_2362434115457799687[49] = 0;
-   out_2362434115457799687[50] = 0;
-   out_2362434115457799687[51] = 0;
-   out_2362434115457799687[52] = 0;
-   out_2362434115457799687[53] = 0;
-   out_2362434115457799687[54] = 0;
-   out_2362434115457799687[55] = 0;
-   out_2362434115457799687[56] = 1;
-   out_2362434115457799687[57] = 0;
-   out_2362434115457799687[58] = 0;
-   out_2362434115457799687[59] = 0;
-   out_2362434115457799687[60] = 0;
-   out_2362434115457799687[61] = 0;
-   out_2362434115457799687[62] = 0;
-   out_2362434115457799687[63] = 0;
-   out_2362434115457799687[64] = 0;
-   out_2362434115457799687[65] = 0;
+void H_9(double *state, double *unused, double *out_2721535251380436755) {
+   out_2721535251380436755[0] = 0;
+   out_2721535251380436755[1] = 0;
+   out_2721535251380436755[2] = 0;
+   out_2721535251380436755[3] = 0;
+   out_2721535251380436755[4] = 0;
+   out_2721535251380436755[5] = 0;
+   out_2721535251380436755[6] = 0;
+   out_2721535251380436755[7] = 0;
+   out_2721535251380436755[8] = 0;
+   out_2721535251380436755[9] = 0;
+   out_2721535251380436755[10] = 1;
+   out_2721535251380436755[11] = 0;
+   out_2721535251380436755[12] = 0;
+   out_2721535251380436755[13] = 0;
+   out_2721535251380436755[14] = 0;
+   out_2721535251380436755[15] = 0;
+   out_2721535251380436755[16] = 0;
+   out_2721535251380436755[17] = 0;
+   out_2721535251380436755[18] = 0;
+   out_2721535251380436755[19] = 0;
+   out_2721535251380436755[20] = 0;
+   out_2721535251380436755[21] = 0;
+   out_2721535251380436755[22] = 0;
+   out_2721535251380436755[23] = 0;
+   out_2721535251380436755[24] = 0;
+   out_2721535251380436755[25] = 0;
+   out_2721535251380436755[26] = 0;
+   out_2721535251380436755[27] = 0;
+   out_2721535251380436755[28] = 0;
+   out_2721535251380436755[29] = 0;
+   out_2721535251380436755[30] = 0;
+   out_2721535251380436755[31] = 0;
+   out_2721535251380436755[32] = 0;
+   out_2721535251380436755[33] = 1;
+   out_2721535251380436755[34] = 0;
+   out_2721535251380436755[35] = 0;
+   out_2721535251380436755[36] = 0;
+   out_2721535251380436755[37] = 0;
+   out_2721535251380436755[38] = 0;
+   out_2721535251380436755[39] = 0;
+   out_2721535251380436755[40] = 0;
+   out_2721535251380436755[41] = 0;
+   out_2721535251380436755[42] = 0;
+   out_2721535251380436755[43] = 0;
+   out_2721535251380436755[44] = 0;
+   out_2721535251380436755[45] = 0;
+   out_2721535251380436755[46] = 0;
+   out_2721535251380436755[47] = 0;
+   out_2721535251380436755[48] = 0;
+   out_2721535251380436755[49] = 0;
+   out_2721535251380436755[50] = 0;
+   out_2721535251380436755[51] = 0;
+   out_2721535251380436755[52] = 0;
+   out_2721535251380436755[53] = 0;
+   out_2721535251380436755[54] = 0;
+   out_2721535251380436755[55] = 0;
+   out_2721535251380436755[56] = 1;
+   out_2721535251380436755[57] = 0;
+   out_2721535251380436755[58] = 0;
+   out_2721535251380436755[59] = 0;
+   out_2721535251380436755[60] = 0;
+   out_2721535251380436755[61] = 0;
+   out_2721535251380436755[62] = 0;
+   out_2721535251380436755[63] = 0;
+   out_2721535251380436755[64] = 0;
+   out_2721535251380436755[65] = 0;
 }
-void h_10(double *state, double *unused, double *out_3520412221597307166) {
-   out_3520412221597307166[0] = 398600500000000.0*(-2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2] + 398600500000000.0*(2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1] + 398600500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*(pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*state[0] + state[16] + state[19];
-   out_3520412221597307166[1] = 398600500000000.0*(2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2] + 398600500000000.0*(-2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0] + 398600500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*(pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*state[1] + state[17] + state[20];
-   out_3520412221597307166[2] = 398600500000000.0*(-2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1] + 398600500000000.0*(2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0] + 398600500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*(pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[2] + state[18] + state[21];
+void h_10(double *state, double *unused, double *out_8252027734007822314) {
+   out_8252027734007822314[0] = 398600500000000.0*(-2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2] + 398600500000000.0*(2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1] + 398600500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*(pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*state[0] + state[16] + state[19];
+   out_8252027734007822314[1] = 398600500000000.0*(2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2] + 398600500000000.0*(-2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0] + 398600500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*(pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*state[1] + state[17] + state[20];
+   out_8252027734007822314[2] = 398600500000000.0*(-2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1] + 398600500000000.0*(2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0] + 398600500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*(pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[2] + state[18] + state[21];
 }
-void H_10(double *state, double *unused, double *out_7396015770213526348) {
-   out_7396015770213526348[0] = -1195801500000000.0*(-2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[2] - 1195801500000000.0*(2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[1] - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*pow(state[0], 2) + 398600500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*(pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2));
-   out_7396015770213526348[1] = -1195801500000000.0*(-2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[1]*state[2] - 1195801500000000.0*(2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*pow(state[1], 2) + 398600500000000.0*(2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5) - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*state[0]*state[1];
-   out_7396015770213526348[2] = -1195801500000000.0*(-2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*pow(state[2], 2) + 398600500000000.0*(-2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5) - 1195801500000000.0*(2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[1]*state[2] - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*state[0]*state[2];
-   out_7396015770213526348[3] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[3] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[6] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[5];
-   out_7396015770213526348[4] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[4] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[5] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[6];
-   out_7396015770213526348[5] = -797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[5] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[4] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[3];
-   out_7396015770213526348[6] = -797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[6] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[3] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[4];
-   out_7396015770213526348[7] = 0;
-   out_7396015770213526348[8] = 0;
-   out_7396015770213526348[9] = 0;
-   out_7396015770213526348[10] = 0;
-   out_7396015770213526348[11] = 0;
-   out_7396015770213526348[12] = 0;
-   out_7396015770213526348[13] = 0;
-   out_7396015770213526348[14] = 0;
-   out_7396015770213526348[15] = 0;
-   out_7396015770213526348[16] = 1;
-   out_7396015770213526348[17] = 0;
-   out_7396015770213526348[18] = 0;
-   out_7396015770213526348[19] = 1;
-   out_7396015770213526348[20] = 0;
-   out_7396015770213526348[21] = 0;
-   out_7396015770213526348[22] = -1195801500000000.0*(2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[2] - 1195801500000000.0*(-2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*pow(state[0], 2) + 398600500000000.0*(-2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5) - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*state[0]*state[1];
-   out_7396015770213526348[23] = -1195801500000000.0*(2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[1]*state[2] - 1195801500000000.0*(-2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[1] - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*pow(state[1], 2) + 398600500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*(pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2));
-   out_7396015770213526348[24] = -1195801500000000.0*(2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*pow(state[2], 2) + 398600500000000.0*(2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5) - 1195801500000000.0*(-2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[2] - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*state[1]*state[2];
-   out_7396015770213526348[25] = -797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[6] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[3] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[4];
-   out_7396015770213526348[26] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[5] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[4] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[3];
-   out_7396015770213526348[27] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[4] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[5] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[6];
-   out_7396015770213526348[28] = -797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[3] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[6] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[5];
-   out_7396015770213526348[29] = 0;
-   out_7396015770213526348[30] = 0;
-   out_7396015770213526348[31] = 0;
-   out_7396015770213526348[32] = 0;
-   out_7396015770213526348[33] = 0;
-   out_7396015770213526348[34] = 0;
-   out_7396015770213526348[35] = 0;
-   out_7396015770213526348[36] = 0;
-   out_7396015770213526348[37] = 0;
-   out_7396015770213526348[38] = 0;
-   out_7396015770213526348[39] = 1;
-   out_7396015770213526348[40] = 0;
-   out_7396015770213526348[41] = 0;
-   out_7396015770213526348[42] = 1;
-   out_7396015770213526348[43] = 0;
-   out_7396015770213526348[44] = -1195801500000000.0*(-2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[1] - 1195801500000000.0*(2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*pow(state[0], 2) + 398600500000000.0*(2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5) - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[0]*state[2];
-   out_7396015770213526348[45] = -1195801500000000.0*(-2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*pow(state[1], 2) + 398600500000000.0*(-2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5) - 1195801500000000.0*(2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[1] - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[1]*state[2];
-   out_7396015770213526348[46] = -1195801500000000.0*(-2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[1]*state[2] - 1195801500000000.0*(2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[2] - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*pow(state[2], 2) + 398600500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*(pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2));
-   out_7396015770213526348[47] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[5] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[4] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[3];
-   out_7396015770213526348[48] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[6] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[3] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[4];
-   out_7396015770213526348[49] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[3] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[6] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[5];
-   out_7396015770213526348[50] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[4] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[5] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[6];
-   out_7396015770213526348[51] = 0;
-   out_7396015770213526348[52] = 0;
-   out_7396015770213526348[53] = 0;
-   out_7396015770213526348[54] = 0;
-   out_7396015770213526348[55] = 0;
-   out_7396015770213526348[56] = 0;
-   out_7396015770213526348[57] = 0;
-   out_7396015770213526348[58] = 0;
-   out_7396015770213526348[59] = 0;
-   out_7396015770213526348[60] = 0;
-   out_7396015770213526348[61] = 0;
-   out_7396015770213526348[62] = 1;
-   out_7396015770213526348[63] = 0;
-   out_7396015770213526348[64] = 0;
-   out_7396015770213526348[65] = 1;
+void H_10(double *state, double *unused, double *out_1022365631619946756) {
+   out_1022365631619946756[0] = -1195801500000000.0*(-2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[2] - 1195801500000000.0*(2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[1] - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*pow(state[0], 2) + 398600500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*(pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2));
+   out_1022365631619946756[1] = -1195801500000000.0*(-2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[1]*state[2] - 1195801500000000.0*(2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*pow(state[1], 2) + 398600500000000.0*(2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5) - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*state[0]*state[1];
+   out_1022365631619946756[2] = -1195801500000000.0*(-2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*pow(state[2], 2) + 398600500000000.0*(-2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5) - 1195801500000000.0*(2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[1]*state[2] - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*state[0]*state[2];
+   out_1022365631619946756[3] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[3] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[6] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[5];
+   out_1022365631619946756[4] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[4] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[5] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[6];
+   out_1022365631619946756[5] = -797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[5] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[4] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[3];
+   out_1022365631619946756[6] = -797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[6] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[3] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[4];
+   out_1022365631619946756[7] = 0;
+   out_1022365631619946756[8] = 0;
+   out_1022365631619946756[9] = 0;
+   out_1022365631619946756[10] = 0;
+   out_1022365631619946756[11] = 0;
+   out_1022365631619946756[12] = 0;
+   out_1022365631619946756[13] = 0;
+   out_1022365631619946756[14] = 0;
+   out_1022365631619946756[15] = 0;
+   out_1022365631619946756[16] = 1;
+   out_1022365631619946756[17] = 0;
+   out_1022365631619946756[18] = 0;
+   out_1022365631619946756[19] = 1;
+   out_1022365631619946756[20] = 0;
+   out_1022365631619946756[21] = 0;
+   out_1022365631619946756[22] = -1195801500000000.0*(2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[2] - 1195801500000000.0*(-2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*pow(state[0], 2) + 398600500000000.0*(-2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5) - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*state[0]*state[1];
+   out_1022365631619946756[23] = -1195801500000000.0*(2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[1]*state[2] - 1195801500000000.0*(-2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[1] - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*pow(state[1], 2) + 398600500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*(pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2));
+   out_1022365631619946756[24] = -1195801500000000.0*(2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*pow(state[2], 2) + 398600500000000.0*(2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5) - 1195801500000000.0*(-2*state[3]*state[6] + 2*state[4]*state[5])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[2] - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*state[1]*state[2];
+   out_1022365631619946756[25] = -797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[6] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[3] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[4];
+   out_1022365631619946756[26] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[5] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[4] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[3];
+   out_1022365631619946756[27] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[4] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[5] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[6];
+   out_1022365631619946756[28] = -797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[3] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[6] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[5];
+   out_1022365631619946756[29] = 0;
+   out_1022365631619946756[30] = 0;
+   out_1022365631619946756[31] = 0;
+   out_1022365631619946756[32] = 0;
+   out_1022365631619946756[33] = 0;
+   out_1022365631619946756[34] = 0;
+   out_1022365631619946756[35] = 0;
+   out_1022365631619946756[36] = 0;
+   out_1022365631619946756[37] = 0;
+   out_1022365631619946756[38] = 0;
+   out_1022365631619946756[39] = 1;
+   out_1022365631619946756[40] = 0;
+   out_1022365631619946756[41] = 0;
+   out_1022365631619946756[42] = 1;
+   out_1022365631619946756[43] = 0;
+   out_1022365631619946756[44] = -1195801500000000.0*(-2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[1] - 1195801500000000.0*(2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*pow(state[0], 2) + 398600500000000.0*(2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5) - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[0]*state[2];
+   out_1022365631619946756[45] = -1195801500000000.0*(-2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*pow(state[1], 2) + 398600500000000.0*(-2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5) - 1195801500000000.0*(2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[1] - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[1]*state[2];
+   out_1022365631619946756[46] = -1195801500000000.0*(-2*state[3]*state[4] + 2*state[5]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[1]*state[2] - 1195801500000000.0*(2*state[3]*state[5] + 2*state[4]*state[6])*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*state[0]*state[2] - 1195801500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -2.5)*(pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*pow(state[2], 2) + 398600500000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*(pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2));
+   out_1022365631619946756[47] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[5] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[4] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[3];
+   out_1022365631619946756[48] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[6] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[3] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[4];
+   out_1022365631619946756[49] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[3] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[6] - 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[5];
+   out_1022365631619946756[50] = 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[0]*state[4] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[1]*state[5] + 797201000000000.0*pow(pow(state[0], 2) + pow(state[1], 2) + pow(state[2], 2), -1.5)*state[2]*state[6];
+   out_1022365631619946756[51] = 0;
+   out_1022365631619946756[52] = 0;
+   out_1022365631619946756[53] = 0;
+   out_1022365631619946756[54] = 0;
+   out_1022365631619946756[55] = 0;
+   out_1022365631619946756[56] = 0;
+   out_1022365631619946756[57] = 0;
+   out_1022365631619946756[58] = 0;
+   out_1022365631619946756[59] = 0;
+   out_1022365631619946756[60] = 0;
+   out_1022365631619946756[61] = 0;
+   out_1022365631619946756[62] = 1;
+   out_1022365631619946756[63] = 0;
+   out_1022365631619946756[64] = 0;
+   out_1022365631619946756[65] = 1;
 }
-void h_12(double *state, double *unused, double *out_7977792700499542139) {
-   out_7977792700499542139[0] = state[0];
-   out_7977792700499542139[1] = state[1];
-   out_7977792700499542139[2] = state[2];
+void h_12(double *state, double *unused, double *out_490832941153373832) {
+   out_490832941153373832[0] = state[0];
+   out_490832941153373832[1] = state[1];
+   out_490832941153373832[2] = state[2];
 }
-void H_12(double *state, double *unused, double *out_2415832645944571463) {
-   out_2415832645944571463[0] = 1;
-   out_2415832645944571463[1] = 0;
-   out_2415832645944571463[2] = 0;
-   out_2415832645944571463[3] = 0;
-   out_2415832645944571463[4] = 0;
-   out_2415832645944571463[5] = 0;
-   out_2415832645944571463[6] = 0;
-   out_2415832645944571463[7] = 0;
-   out_2415832645944571463[8] = 0;
-   out_2415832645944571463[9] = 0;
-   out_2415832645944571463[10] = 0;
-   out_2415832645944571463[11] = 0;
-   out_2415832645944571463[12] = 0;
-   out_2415832645944571463[13] = 0;
-   out_2415832645944571463[14] = 0;
-   out_2415832645944571463[15] = 0;
-   out_2415832645944571463[16] = 0;
-   out_2415832645944571463[17] = 0;
-   out_2415832645944571463[18] = 0;
-   out_2415832645944571463[19] = 0;
-   out_2415832645944571463[20] = 0;
-   out_2415832645944571463[21] = 0;
-   out_2415832645944571463[22] = 0;
-   out_2415832645944571463[23] = 1;
-   out_2415832645944571463[24] = 0;
-   out_2415832645944571463[25] = 0;
-   out_2415832645944571463[26] = 0;
-   out_2415832645944571463[27] = 0;
-   out_2415832645944571463[28] = 0;
-   out_2415832645944571463[29] = 0;
-   out_2415832645944571463[30] = 0;
-   out_2415832645944571463[31] = 0;
-   out_2415832645944571463[32] = 0;
-   out_2415832645944571463[33] = 0;
-   out_2415832645944571463[34] = 0;
-   out_2415832645944571463[35] = 0;
-   out_2415832645944571463[36] = 0;
-   out_2415832645944571463[37] = 0;
-   out_2415832645944571463[38] = 0;
-   out_2415832645944571463[39] = 0;
-   out_2415832645944571463[40] = 0;
-   out_2415832645944571463[41] = 0;
-   out_2415832645944571463[42] = 0;
-   out_2415832645944571463[43] = 0;
-   out_2415832645944571463[44] = 0;
-   out_2415832645944571463[45] = 0;
-   out_2415832645944571463[46] = 1;
-   out_2415832645944571463[47] = 0;
-   out_2415832645944571463[48] = 0;
-   out_2415832645944571463[49] = 0;
-   out_2415832645944571463[50] = 0;
-   out_2415832645944571463[51] = 0;
-   out_2415832645944571463[52] = 0;
-   out_2415832645944571463[53] = 0;
-   out_2415832645944571463[54] = 0;
-   out_2415832645944571463[55] = 0;
-   out_2415832645944571463[56] = 0;
-   out_2415832645944571463[57] = 0;
-   out_2415832645944571463[58] = 0;
-   out_2415832645944571463[59] = 0;
-   out_2415832645944571463[60] = 0;
-   out_2415832645944571463[61] = 0;
-   out_2415832645944571463[62] = 0;
-   out_2415832645944571463[63] = 0;
-   out_2415832645944571463[64] = 0;
-   out_2415832645944571463[65] = 0;
+void H_12(double *state, double *unused, double *out_4989297778612922430) {
+   out_4989297778612922430[0] = 1;
+   out_4989297778612922430[1] = 0;
+   out_4989297778612922430[2] = 0;
+   out_4989297778612922430[3] = 0;
+   out_4989297778612922430[4] = 0;
+   out_4989297778612922430[5] = 0;
+   out_4989297778612922430[6] = 0;
+   out_4989297778612922430[7] = 0;
+   out_4989297778612922430[8] = 0;
+   out_4989297778612922430[9] = 0;
+   out_4989297778612922430[10] = 0;
+   out_4989297778612922430[11] = 0;
+   out_4989297778612922430[12] = 0;
+   out_4989297778612922430[13] = 0;
+   out_4989297778612922430[14] = 0;
+   out_4989297778612922430[15] = 0;
+   out_4989297778612922430[16] = 0;
+   out_4989297778612922430[17] = 0;
+   out_4989297778612922430[18] = 0;
+   out_4989297778612922430[19] = 0;
+   out_4989297778612922430[20] = 0;
+   out_4989297778612922430[21] = 0;
+   out_4989297778612922430[22] = 0;
+   out_4989297778612922430[23] = 1;
+   out_4989297778612922430[24] = 0;
+   out_4989297778612922430[25] = 0;
+   out_4989297778612922430[26] = 0;
+   out_4989297778612922430[27] = 0;
+   out_4989297778612922430[28] = 0;
+   out_4989297778612922430[29] = 0;
+   out_4989297778612922430[30] = 0;
+   out_4989297778612922430[31] = 0;
+   out_4989297778612922430[32] = 0;
+   out_4989297778612922430[33] = 0;
+   out_4989297778612922430[34] = 0;
+   out_4989297778612922430[35] = 0;
+   out_4989297778612922430[36] = 0;
+   out_4989297778612922430[37] = 0;
+   out_4989297778612922430[38] = 0;
+   out_4989297778612922430[39] = 0;
+   out_4989297778612922430[40] = 0;
+   out_4989297778612922430[41] = 0;
+   out_4989297778612922430[42] = 0;
+   out_4989297778612922430[43] = 0;
+   out_4989297778612922430[44] = 0;
+   out_4989297778612922430[45] = 0;
+   out_4989297778612922430[46] = 1;
+   out_4989297778612922430[47] = 0;
+   out_4989297778612922430[48] = 0;
+   out_4989297778612922430[49] = 0;
+   out_4989297778612922430[50] = 0;
+   out_4989297778612922430[51] = 0;
+   out_4989297778612922430[52] = 0;
+   out_4989297778612922430[53] = 0;
+   out_4989297778612922430[54] = 0;
+   out_4989297778612922430[55] = 0;
+   out_4989297778612922430[56] = 0;
+   out_4989297778612922430[57] = 0;
+   out_4989297778612922430[58] = 0;
+   out_4989297778612922430[59] = 0;
+   out_4989297778612922430[60] = 0;
+   out_4989297778612922430[61] = 0;
+   out_4989297778612922430[62] = 0;
+   out_4989297778612922430[63] = 0;
+   out_4989297778612922430[64] = 0;
+   out_4989297778612922430[65] = 0;
 }
-void h_35(double *state, double *unused, double *out_3752355986187417342) {
-   out_3752355986187417342[0] = state[7];
-   out_3752355986187417342[1] = state[8];
-   out_3752355986187417342[2] = state[9];
+void h_35(double *state, double *unused, double *out_851812883202032952) {
+   out_851812883202032952[0] = state[7];
+   out_851812883202032952[1] = state[8];
+   out_851812883202032952[2] = state[9];
 }
-void H_35(double *state, double *unused, double *out_763038295285217044) {
-   out_763038295285217044[0] = 0;
-   out_763038295285217044[1] = 0;
-   out_763038295285217044[2] = 0;
-   out_763038295285217044[3] = 0;
-   out_763038295285217044[4] = 0;
-   out_763038295285217044[5] = 0;
-   out_763038295285217044[6] = 0;
-   out_763038295285217044[7] = 1;
-   out_763038295285217044[8] = 0;
-   out_763038295285217044[9] = 0;
-   out_763038295285217044[10] = 0;
-   out_763038295285217044[11] = 0;
-   out_763038295285217044[12] = 0;
-   out_763038295285217044[13] = 0;
-   out_763038295285217044[14] = 0;
-   out_763038295285217044[15] = 0;
-   out_763038295285217044[16] = 0;
-   out_763038295285217044[17] = 0;
-   out_763038295285217044[18] = 0;
-   out_763038295285217044[19] = 0;
-   out_763038295285217044[20] = 0;
-   out_763038295285217044[21] = 0;
-   out_763038295285217044[22] = 0;
-   out_763038295285217044[23] = 0;
-   out_763038295285217044[24] = 0;
-   out_763038295285217044[25] = 0;
-   out_763038295285217044[26] = 0;
-   out_763038295285217044[27] = 0;
-   out_763038295285217044[28] = 0;
-   out_763038295285217044[29] = 0;
-   out_763038295285217044[30] = 1;
-   out_763038295285217044[31] = 0;
-   out_763038295285217044[32] = 0;
-   out_763038295285217044[33] = 0;
-   out_763038295285217044[34] = 0;
-   out_763038295285217044[35] = 0;
-   out_763038295285217044[36] = 0;
-   out_763038295285217044[37] = 0;
-   out_763038295285217044[38] = 0;
-   out_763038295285217044[39] = 0;
-   out_763038295285217044[40] = 0;
-   out_763038295285217044[41] = 0;
-   out_763038295285217044[42] = 0;
-   out_763038295285217044[43] = 0;
-   out_763038295285217044[44] = 0;
-   out_763038295285217044[45] = 0;
-   out_763038295285217044[46] = 0;
-   out_763038295285217044[47] = 0;
-   out_763038295285217044[48] = 0;
-   out_763038295285217044[49] = 0;
-   out_763038295285217044[50] = 0;
-   out_763038295285217044[51] = 0;
-   out_763038295285217044[52] = 0;
-   out_763038295285217044[53] = 1;
-   out_763038295285217044[54] = 0;
-   out_763038295285217044[55] = 0;
-   out_763038295285217044[56] = 0;
-   out_763038295285217044[57] = 0;
-   out_763038295285217044[58] = 0;
-   out_763038295285217044[59] = 0;
-   out_763038295285217044[60] = 0;
-   out_763038295285217044[61] = 0;
-   out_763038295285217044[62] = 0;
-   out_763038295285217044[63] = 0;
-   out_763038295285217044[64] = 0;
-   out_763038295285217044[65] = 0;
+void H_35(double *state, double *unused, double *out_6642092129272276849) {
+   out_6642092129272276849[0] = 0;
+   out_6642092129272276849[1] = 0;
+   out_6642092129272276849[2] = 0;
+   out_6642092129272276849[3] = 0;
+   out_6642092129272276849[4] = 0;
+   out_6642092129272276849[5] = 0;
+   out_6642092129272276849[6] = 0;
+   out_6642092129272276849[7] = 1;
+   out_6642092129272276849[8] = 0;
+   out_6642092129272276849[9] = 0;
+   out_6642092129272276849[10] = 0;
+   out_6642092129272276849[11] = 0;
+   out_6642092129272276849[12] = 0;
+   out_6642092129272276849[13] = 0;
+   out_6642092129272276849[14] = 0;
+   out_6642092129272276849[15] = 0;
+   out_6642092129272276849[16] = 0;
+   out_6642092129272276849[17] = 0;
+   out_6642092129272276849[18] = 0;
+   out_6642092129272276849[19] = 0;
+   out_6642092129272276849[20] = 0;
+   out_6642092129272276849[21] = 0;
+   out_6642092129272276849[22] = 0;
+   out_6642092129272276849[23] = 0;
+   out_6642092129272276849[24] = 0;
+   out_6642092129272276849[25] = 0;
+   out_6642092129272276849[26] = 0;
+   out_6642092129272276849[27] = 0;
+   out_6642092129272276849[28] = 0;
+   out_6642092129272276849[29] = 0;
+   out_6642092129272276849[30] = 1;
+   out_6642092129272276849[31] = 0;
+   out_6642092129272276849[32] = 0;
+   out_6642092129272276849[33] = 0;
+   out_6642092129272276849[34] = 0;
+   out_6642092129272276849[35] = 0;
+   out_6642092129272276849[36] = 0;
+   out_6642092129272276849[37] = 0;
+   out_6642092129272276849[38] = 0;
+   out_6642092129272276849[39] = 0;
+   out_6642092129272276849[40] = 0;
+   out_6642092129272276849[41] = 0;
+   out_6642092129272276849[42] = 0;
+   out_6642092129272276849[43] = 0;
+   out_6642092129272276849[44] = 0;
+   out_6642092129272276849[45] = 0;
+   out_6642092129272276849[46] = 0;
+   out_6642092129272276849[47] = 0;
+   out_6642092129272276849[48] = 0;
+   out_6642092129272276849[49] = 0;
+   out_6642092129272276849[50] = 0;
+   out_6642092129272276849[51] = 0;
+   out_6642092129272276849[52] = 0;
+   out_6642092129272276849[53] = 1;
+   out_6642092129272276849[54] = 0;
+   out_6642092129272276849[55] = 0;
+   out_6642092129272276849[56] = 0;
+   out_6642092129272276849[57] = 0;
+   out_6642092129272276849[58] = 0;
+   out_6642092129272276849[59] = 0;
+   out_6642092129272276849[60] = 0;
+   out_6642092129272276849[61] = 0;
+   out_6642092129272276849[62] = 0;
+   out_6642092129272276849[63] = 0;
+   out_6642092129272276849[64] = 0;
+   out_6642092129272276849[65] = 0;
 }
-void h_32(double *state, double *unused, double *out_2897039262415537399) {
-   out_2897039262415537399[0] = state[3];
-   out_2897039262415537399[1] = state[4];
-   out_2897039262415537399[2] = state[5];
-   out_2897039262415537399[3] = state[6];
+void h_32(double *state, double *unused, double *out_7198045605532929596) {
+   out_7198045605532929596[0] = state[3];
+   out_7198045605532929596[1] = state[4];
+   out_7198045605532929596[2] = state[5];
+   out_7198045605532929596[3] = state[6];
 }
-void H_32(double *state, double *unused, double *out_6564342667492829602) {
-   out_6564342667492829602[0] = 0;
-   out_6564342667492829602[1] = 0;
-   out_6564342667492829602[2] = 0;
-   out_6564342667492829602[3] = 1;
-   out_6564342667492829602[4] = 0;
-   out_6564342667492829602[5] = 0;
-   out_6564342667492829602[6] = 0;
-   out_6564342667492829602[7] = 0;
-   out_6564342667492829602[8] = 0;
-   out_6564342667492829602[9] = 0;
-   out_6564342667492829602[10] = 0;
-   out_6564342667492829602[11] = 0;
-   out_6564342667492829602[12] = 0;
-   out_6564342667492829602[13] = 0;
-   out_6564342667492829602[14] = 0;
-   out_6564342667492829602[15] = 0;
-   out_6564342667492829602[16] = 0;
-   out_6564342667492829602[17] = 0;
-   out_6564342667492829602[18] = 0;
-   out_6564342667492829602[19] = 0;
-   out_6564342667492829602[20] = 0;
-   out_6564342667492829602[21] = 0;
-   out_6564342667492829602[22] = 0;
-   out_6564342667492829602[23] = 0;
-   out_6564342667492829602[24] = 0;
-   out_6564342667492829602[25] = 0;
-   out_6564342667492829602[26] = 1;
-   out_6564342667492829602[27] = 0;
-   out_6564342667492829602[28] = 0;
-   out_6564342667492829602[29] = 0;
-   out_6564342667492829602[30] = 0;
-   out_6564342667492829602[31] = 0;
-   out_6564342667492829602[32] = 0;
-   out_6564342667492829602[33] = 0;
-   out_6564342667492829602[34] = 0;
-   out_6564342667492829602[35] = 0;
-   out_6564342667492829602[36] = 0;
-   out_6564342667492829602[37] = 0;
-   out_6564342667492829602[38] = 0;
-   out_6564342667492829602[39] = 0;
-   out_6564342667492829602[40] = 0;
-   out_6564342667492829602[41] = 0;
-   out_6564342667492829602[42] = 0;
-   out_6564342667492829602[43] = 0;
-   out_6564342667492829602[44] = 0;
-   out_6564342667492829602[45] = 0;
-   out_6564342667492829602[46] = 0;
-   out_6564342667492829602[47] = 0;
-   out_6564342667492829602[48] = 0;
-   out_6564342667492829602[49] = 1;
-   out_6564342667492829602[50] = 0;
-   out_6564342667492829602[51] = 0;
-   out_6564342667492829602[52] = 0;
-   out_6564342667492829602[53] = 0;
-   out_6564342667492829602[54] = 0;
-   out_6564342667492829602[55] = 0;
-   out_6564342667492829602[56] = 0;
-   out_6564342667492829602[57] = 0;
-   out_6564342667492829602[58] = 0;
-   out_6564342667492829602[59] = 0;
-   out_6564342667492829602[60] = 0;
-   out_6564342667492829602[61] = 0;
-   out_6564342667492829602[62] = 0;
-   out_6564342667492829602[63] = 0;
-   out_6564342667492829602[64] = 0;
-   out_6564342667492829602[65] = 0;
-   out_6564342667492829602[66] = 0;
-   out_6564342667492829602[67] = 0;
-   out_6564342667492829602[68] = 0;
-   out_6564342667492829602[69] = 0;
-   out_6564342667492829602[70] = 0;
-   out_6564342667492829602[71] = 0;
-   out_6564342667492829602[72] = 1;
-   out_6564342667492829602[73] = 0;
-   out_6564342667492829602[74] = 0;
-   out_6564342667492829602[75] = 0;
-   out_6564342667492829602[76] = 0;
-   out_6564342667492829602[77] = 0;
-   out_6564342667492829602[78] = 0;
-   out_6564342667492829602[79] = 0;
-   out_6564342667492829602[80] = 0;
-   out_6564342667492829602[81] = 0;
-   out_6564342667492829602[82] = 0;
-   out_6564342667492829602[83] = 0;
-   out_6564342667492829602[84] = 0;
-   out_6564342667492829602[85] = 0;
-   out_6564342667492829602[86] = 0;
-   out_6564342667492829602[87] = 0;
+void H_32(double *state, double *unused, double *out_6510927344331536380) {
+   out_6510927344331536380[0] = 0;
+   out_6510927344331536380[1] = 0;
+   out_6510927344331536380[2] = 0;
+   out_6510927344331536380[3] = 1;
+   out_6510927344331536380[4] = 0;
+   out_6510927344331536380[5] = 0;
+   out_6510927344331536380[6] = 0;
+   out_6510927344331536380[7] = 0;
+   out_6510927344331536380[8] = 0;
+   out_6510927344331536380[9] = 0;
+   out_6510927344331536380[10] = 0;
+   out_6510927344331536380[11] = 0;
+   out_6510927344331536380[12] = 0;
+   out_6510927344331536380[13] = 0;
+   out_6510927344331536380[14] = 0;
+   out_6510927344331536380[15] = 0;
+   out_6510927344331536380[16] = 0;
+   out_6510927344331536380[17] = 0;
+   out_6510927344331536380[18] = 0;
+   out_6510927344331536380[19] = 0;
+   out_6510927344331536380[20] = 0;
+   out_6510927344331536380[21] = 0;
+   out_6510927344331536380[22] = 0;
+   out_6510927344331536380[23] = 0;
+   out_6510927344331536380[24] = 0;
+   out_6510927344331536380[25] = 0;
+   out_6510927344331536380[26] = 1;
+   out_6510927344331536380[27] = 0;
+   out_6510927344331536380[28] = 0;
+   out_6510927344331536380[29] = 0;
+   out_6510927344331536380[30] = 0;
+   out_6510927344331536380[31] = 0;
+   out_6510927344331536380[32] = 0;
+   out_6510927344331536380[33] = 0;
+   out_6510927344331536380[34] = 0;
+   out_6510927344331536380[35] = 0;
+   out_6510927344331536380[36] = 0;
+   out_6510927344331536380[37] = 0;
+   out_6510927344331536380[38] = 0;
+   out_6510927344331536380[39] = 0;
+   out_6510927344331536380[40] = 0;
+   out_6510927344331536380[41] = 0;
+   out_6510927344331536380[42] = 0;
+   out_6510927344331536380[43] = 0;
+   out_6510927344331536380[44] = 0;
+   out_6510927344331536380[45] = 0;
+   out_6510927344331536380[46] = 0;
+   out_6510927344331536380[47] = 0;
+   out_6510927344331536380[48] = 0;
+   out_6510927344331536380[49] = 1;
+   out_6510927344331536380[50] = 0;
+   out_6510927344331536380[51] = 0;
+   out_6510927344331536380[52] = 0;
+   out_6510927344331536380[53] = 0;
+   out_6510927344331536380[54] = 0;
+   out_6510927344331536380[55] = 0;
+   out_6510927344331536380[56] = 0;
+   out_6510927344331536380[57] = 0;
+   out_6510927344331536380[58] = 0;
+   out_6510927344331536380[59] = 0;
+   out_6510927344331536380[60] = 0;
+   out_6510927344331536380[61] = 0;
+   out_6510927344331536380[62] = 0;
+   out_6510927344331536380[63] = 0;
+   out_6510927344331536380[64] = 0;
+   out_6510927344331536380[65] = 0;
+   out_6510927344331536380[66] = 0;
+   out_6510927344331536380[67] = 0;
+   out_6510927344331536380[68] = 0;
+   out_6510927344331536380[69] = 0;
+   out_6510927344331536380[70] = 0;
+   out_6510927344331536380[71] = 0;
+   out_6510927344331536380[72] = 1;
+   out_6510927344331536380[73] = 0;
+   out_6510927344331536380[74] = 0;
+   out_6510927344331536380[75] = 0;
+   out_6510927344331536380[76] = 0;
+   out_6510927344331536380[77] = 0;
+   out_6510927344331536380[78] = 0;
+   out_6510927344331536380[79] = 0;
+   out_6510927344331536380[80] = 0;
+   out_6510927344331536380[81] = 0;
+   out_6510927344331536380[82] = 0;
+   out_6510927344331536380[83] = 0;
+   out_6510927344331536380[84] = 0;
+   out_6510927344331536380[85] = 0;
+   out_6510927344331536380[86] = 0;
+   out_6510927344331536380[87] = 0;
 }
-void h_13(double *state, double *unused, double *out_7535737061045930452) {
-   out_7535737061045930452[0] = (-2*state[3]*state[5] + 2*state[4]*state[6])*state[9] + (2*state[3]*state[6] + 2*state[4]*state[5])*state[8] + (pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*state[7];
-   out_7535737061045930452[1] = (2*state[3]*state[4] + 2*state[5]*state[6])*state[9] + (-2*state[3]*state[6] + 2*state[4]*state[5])*state[7] + (pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*state[8];
-   out_7535737061045930452[2] = (-2*state[3]*state[4] + 2*state[5]*state[6])*state[8] + (2*state[3]*state[5] + 2*state[4]*state[6])*state[7] + (pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[9];
+void h_13(double *state, double *unused, double *out_6813957582124674447) {
+   out_6813957582124674447[0] = (-2*state[3]*state[5] + 2*state[4]*state[6])*state[9] + (2*state[3]*state[6] + 2*state[4]*state[5])*state[8] + (pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2))*state[7];
+   out_6813957582124674447[1] = (2*state[3]*state[4] + 2*state[5]*state[6])*state[9] + (-2*state[3]*state[6] + 2*state[4]*state[5])*state[7] + (pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2))*state[8];
+   out_6813957582124674447[2] = (-2*state[3]*state[4] + 2*state[5]*state[6])*state[8] + (2*state[3]*state[5] + 2*state[4]*state[6])*state[7] + (pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2))*state[9];
 }
-void H_13(double *state, double *unused, double *out_3042894167287587122) {
-   out_3042894167287587122[0] = 0;
-   out_3042894167287587122[1] = 0;
-   out_3042894167287587122[2] = 0;
-   out_3042894167287587122[3] = 2*state[3]*state[7] - 2*state[5]*state[9] + 2*state[6]*state[8];
-   out_3042894167287587122[4] = 2*state[4]*state[7] + 2*state[5]*state[8] + 2*state[6]*state[9];
-   out_3042894167287587122[5] = -2*state[3]*state[9] + 2*state[4]*state[8] - 2*state[5]*state[7];
-   out_3042894167287587122[6] = 2*state[3]*state[8] + 2*state[4]*state[9] - 2*state[6]*state[7];
-   out_3042894167287587122[7] = pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2);
-   out_3042894167287587122[8] = 2*state[3]*state[6] + 2*state[4]*state[5];
-   out_3042894167287587122[9] = -2*state[3]*state[5] + 2*state[4]*state[6];
-   out_3042894167287587122[10] = 0;
-   out_3042894167287587122[11] = 0;
-   out_3042894167287587122[12] = 0;
-   out_3042894167287587122[13] = 0;
-   out_3042894167287587122[14] = 0;
-   out_3042894167287587122[15] = 0;
-   out_3042894167287587122[16] = 0;
-   out_3042894167287587122[17] = 0;
-   out_3042894167287587122[18] = 0;
-   out_3042894167287587122[19] = 0;
-   out_3042894167287587122[20] = 0;
-   out_3042894167287587122[21] = 0;
-   out_3042894167287587122[22] = 0;
-   out_3042894167287587122[23] = 0;
-   out_3042894167287587122[24] = 0;
-   out_3042894167287587122[25] = 2*state[3]*state[8] + 2*state[4]*state[9] - 2*state[6]*state[7];
-   out_3042894167287587122[26] = 2*state[3]*state[9] - 2*state[4]*state[8] + 2*state[5]*state[7];
-   out_3042894167287587122[27] = 2*state[4]*state[7] + 2*state[5]*state[8] + 2*state[6]*state[9];
-   out_3042894167287587122[28] = -2*state[3]*state[7] + 2*state[5]*state[9] - 2*state[6]*state[8];
-   out_3042894167287587122[29] = -2*state[3]*state[6] + 2*state[4]*state[5];
-   out_3042894167287587122[30] = pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2);
-   out_3042894167287587122[31] = 2*state[3]*state[4] + 2*state[5]*state[6];
-   out_3042894167287587122[32] = 0;
-   out_3042894167287587122[33] = 0;
-   out_3042894167287587122[34] = 0;
-   out_3042894167287587122[35] = 0;
-   out_3042894167287587122[36] = 0;
-   out_3042894167287587122[37] = 0;
-   out_3042894167287587122[38] = 0;
-   out_3042894167287587122[39] = 0;
-   out_3042894167287587122[40] = 0;
-   out_3042894167287587122[41] = 0;
-   out_3042894167287587122[42] = 0;
-   out_3042894167287587122[43] = 0;
-   out_3042894167287587122[44] = 0;
-   out_3042894167287587122[45] = 0;
-   out_3042894167287587122[46] = 0;
-   out_3042894167287587122[47] = 2*state[3]*state[9] - 2*state[4]*state[8] + 2*state[5]*state[7];
-   out_3042894167287587122[48] = -2*state[3]*state[8] - 2*state[4]*state[9] + 2*state[6]*state[7];
-   out_3042894167287587122[49] = 2*state[3]*state[7] - 2*state[5]*state[9] + 2*state[6]*state[8];
-   out_3042894167287587122[50] = 2*state[4]*state[7] + 2*state[5]*state[8] + 2*state[6]*state[9];
-   out_3042894167287587122[51] = 2*state[3]*state[5] + 2*state[4]*state[6];
-   out_3042894167287587122[52] = -2*state[3]*state[4] + 2*state[5]*state[6];
-   out_3042894167287587122[53] = pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2);
-   out_3042894167287587122[54] = 0;
-   out_3042894167287587122[55] = 0;
-   out_3042894167287587122[56] = 0;
-   out_3042894167287587122[57] = 0;
-   out_3042894167287587122[58] = 0;
-   out_3042894167287587122[59] = 0;
-   out_3042894167287587122[60] = 0;
-   out_3042894167287587122[61] = 0;
-   out_3042894167287587122[62] = 0;
-   out_3042894167287587122[63] = 0;
-   out_3042894167287587122[64] = 0;
-   out_3042894167287587122[65] = 0;
+void H_13(double *state, double *unused, double *out_7851984426394690165) {
+   out_7851984426394690165[0] = 0;
+   out_7851984426394690165[1] = 0;
+   out_7851984426394690165[2] = 0;
+   out_7851984426394690165[3] = 2*state[3]*state[7] - 2*state[5]*state[9] + 2*state[6]*state[8];
+   out_7851984426394690165[4] = 2*state[4]*state[7] + 2*state[5]*state[8] + 2*state[6]*state[9];
+   out_7851984426394690165[5] = -2*state[3]*state[9] + 2*state[4]*state[8] - 2*state[5]*state[7];
+   out_7851984426394690165[6] = 2*state[3]*state[8] + 2*state[4]*state[9] - 2*state[6]*state[7];
+   out_7851984426394690165[7] = pow(state[3], 2) + pow(state[4], 2) - pow(state[5], 2) - pow(state[6], 2);
+   out_7851984426394690165[8] = 2*state[3]*state[6] + 2*state[4]*state[5];
+   out_7851984426394690165[9] = -2*state[3]*state[5] + 2*state[4]*state[6];
+   out_7851984426394690165[10] = 0;
+   out_7851984426394690165[11] = 0;
+   out_7851984426394690165[12] = 0;
+   out_7851984426394690165[13] = 0;
+   out_7851984426394690165[14] = 0;
+   out_7851984426394690165[15] = 0;
+   out_7851984426394690165[16] = 0;
+   out_7851984426394690165[17] = 0;
+   out_7851984426394690165[18] = 0;
+   out_7851984426394690165[19] = 0;
+   out_7851984426394690165[20] = 0;
+   out_7851984426394690165[21] = 0;
+   out_7851984426394690165[22] = 0;
+   out_7851984426394690165[23] = 0;
+   out_7851984426394690165[24] = 0;
+   out_7851984426394690165[25] = 2*state[3]*state[8] + 2*state[4]*state[9] - 2*state[6]*state[7];
+   out_7851984426394690165[26] = 2*state[3]*state[9] - 2*state[4]*state[8] + 2*state[5]*state[7];
+   out_7851984426394690165[27] = 2*state[4]*state[7] + 2*state[5]*state[8] + 2*state[6]*state[9];
+   out_7851984426394690165[28] = -2*state[3]*state[7] + 2*state[5]*state[9] - 2*state[6]*state[8];
+   out_7851984426394690165[29] = -2*state[3]*state[6] + 2*state[4]*state[5];
+   out_7851984426394690165[30] = pow(state[3], 2) - pow(state[4], 2) + pow(state[5], 2) - pow(state[6], 2);
+   out_7851984426394690165[31] = 2*state[3]*state[4] + 2*state[5]*state[6];
+   out_7851984426394690165[32] = 0;
+   out_7851984426394690165[33] = 0;
+   out_7851984426394690165[34] = 0;
+   out_7851984426394690165[35] = 0;
+   out_7851984426394690165[36] = 0;
+   out_7851984426394690165[37] = 0;
+   out_7851984426394690165[38] = 0;
+   out_7851984426394690165[39] = 0;
+   out_7851984426394690165[40] = 0;
+   out_7851984426394690165[41] = 0;
+   out_7851984426394690165[42] = 0;
+   out_7851984426394690165[43] = 0;
+   out_7851984426394690165[44] = 0;
+   out_7851984426394690165[45] = 0;
+   out_7851984426394690165[46] = 0;
+   out_7851984426394690165[47] = 2*state[3]*state[9] - 2*state[4]*state[8] + 2*state[5]*state[7];
+   out_7851984426394690165[48] = -2*state[3]*state[8] - 2*state[4]*state[9] + 2*state[6]*state[7];
+   out_7851984426394690165[49] = 2*state[3]*state[7] - 2*state[5]*state[9] + 2*state[6]*state[8];
+   out_7851984426394690165[50] = 2*state[4]*state[7] + 2*state[5]*state[8] + 2*state[6]*state[9];
+   out_7851984426394690165[51] = 2*state[3]*state[5] + 2*state[4]*state[6];
+   out_7851984426394690165[52] = -2*state[3]*state[4] + 2*state[5]*state[6];
+   out_7851984426394690165[53] = pow(state[3], 2) - pow(state[4], 2) - pow(state[5], 2) + pow(state[6], 2);
+   out_7851984426394690165[54] = 0;
+   out_7851984426394690165[55] = 0;
+   out_7851984426394690165[56] = 0;
+   out_7851984426394690165[57] = 0;
+   out_7851984426394690165[58] = 0;
+   out_7851984426394690165[59] = 0;
+   out_7851984426394690165[60] = 0;
+   out_7851984426394690165[61] = 0;
+   out_7851984426394690165[62] = 0;
+   out_7851984426394690165[63] = 0;
+   out_7851984426394690165[64] = 0;
+   out_7851984426394690165[65] = 0;
 }
-void h_14(double *state, double *unused, double *out_4168973980757166041) {
-   out_4168973980757166041[0] = state[10];
-   out_4168973980757166041[1] = state[11];
-   out_4168973980757166041[2] = state[12];
+void h_14(double *state, double *unused, double *out_2016376091952434025) {
+   out_2016376091952434025[0] = state[10];
+   out_2016376091952434025[1] = state[11];
+   out_2016376091952434025[2] = state[12];
 }
-void H_14(double *state, double *unused, double *out_2362434115457799687) {
-   out_2362434115457799687[0] = 0;
-   out_2362434115457799687[1] = 0;
-   out_2362434115457799687[2] = 0;
-   out_2362434115457799687[3] = 0;
-   out_2362434115457799687[4] = 0;
-   out_2362434115457799687[5] = 0;
-   out_2362434115457799687[6] = 0;
-   out_2362434115457799687[7] = 0;
-   out_2362434115457799687[8] = 0;
-   out_2362434115457799687[9] = 0;
-   out_2362434115457799687[10] = 1;
-   out_2362434115457799687[11] = 0;
-   out_2362434115457799687[12] = 0;
-   out_2362434115457799687[13] = 0;
-   out_2362434115457799687[14] = 0;
-   out_2362434115457799687[15] = 0;
-   out_2362434115457799687[16] = 0;
-   out_2362434115457799687[17] = 0;
-   out_2362434115457799687[18] = 0;
-   out_2362434115457799687[19] = 0;
-   out_2362434115457799687[20] = 0;
-   out_2362434115457799687[21] = 0;
-   out_2362434115457799687[22] = 0;
-   out_2362434115457799687[23] = 0;
-   out_2362434115457799687[24] = 0;
-   out_2362434115457799687[25] = 0;
-   out_2362434115457799687[26] = 0;
-   out_2362434115457799687[27] = 0;
-   out_2362434115457799687[28] = 0;
-   out_2362434115457799687[29] = 0;
-   out_2362434115457799687[30] = 0;
-   out_2362434115457799687[31] = 0;
-   out_2362434115457799687[32] = 0;
-   out_2362434115457799687[33] = 1;
-   out_2362434115457799687[34] = 0;
-   out_2362434115457799687[35] = 0;
-   out_2362434115457799687[36] = 0;
-   out_2362434115457799687[37] = 0;
-   out_2362434115457799687[38] = 0;
-   out_2362434115457799687[39] = 0;
-   out_2362434115457799687[40] = 0;
-   out_2362434115457799687[41] = 0;
-   out_2362434115457799687[42] = 0;
-   out_2362434115457799687[43] = 0;
-   out_2362434115457799687[44] = 0;
-   out_2362434115457799687[45] = 0;
-   out_2362434115457799687[46] = 0;
-   out_2362434115457799687[47] = 0;
-   out_2362434115457799687[48] = 0;
-   out_2362434115457799687[49] = 0;
-   out_2362434115457799687[50] = 0;
-   out_2362434115457799687[51] = 0;
-   out_2362434115457799687[52] = 0;
-   out_2362434115457799687[53] = 0;
-   out_2362434115457799687[54] = 0;
-   out_2362434115457799687[55] = 0;
-   out_2362434115457799687[56] = 1;
-   out_2362434115457799687[57] = 0;
-   out_2362434115457799687[58] = 0;
-   out_2362434115457799687[59] = 0;
-   out_2362434115457799687[60] = 0;
-   out_2362434115457799687[61] = 0;
-   out_2362434115457799687[62] = 0;
-   out_2362434115457799687[63] = 0;
-   out_2362434115457799687[64] = 0;
-   out_2362434115457799687[65] = 0;
+void H_14(double *state, double *unused, double *out_2721535251380436755) {
+   out_2721535251380436755[0] = 0;
+   out_2721535251380436755[1] = 0;
+   out_2721535251380436755[2] = 0;
+   out_2721535251380436755[3] = 0;
+   out_2721535251380436755[4] = 0;
+   out_2721535251380436755[5] = 0;
+   out_2721535251380436755[6] = 0;
+   out_2721535251380436755[7] = 0;
+   out_2721535251380436755[8] = 0;
+   out_2721535251380436755[9] = 0;
+   out_2721535251380436755[10] = 1;
+   out_2721535251380436755[11] = 0;
+   out_2721535251380436755[12] = 0;
+   out_2721535251380436755[13] = 0;
+   out_2721535251380436755[14] = 0;
+   out_2721535251380436755[15] = 0;
+   out_2721535251380436755[16] = 0;
+   out_2721535251380436755[17] = 0;
+   out_2721535251380436755[18] = 0;
+   out_2721535251380436755[19] = 0;
+   out_2721535251380436755[20] = 0;
+   out_2721535251380436755[21] = 0;
+   out_2721535251380436755[22] = 0;
+   out_2721535251380436755[23] = 0;
+   out_2721535251380436755[24] = 0;
+   out_2721535251380436755[25] = 0;
+   out_2721535251380436755[26] = 0;
+   out_2721535251380436755[27] = 0;
+   out_2721535251380436755[28] = 0;
+   out_2721535251380436755[29] = 0;
+   out_2721535251380436755[30] = 0;
+   out_2721535251380436755[31] = 0;
+   out_2721535251380436755[32] = 0;
+   out_2721535251380436755[33] = 1;
+   out_2721535251380436755[34] = 0;
+   out_2721535251380436755[35] = 0;
+   out_2721535251380436755[36] = 0;
+   out_2721535251380436755[37] = 0;
+   out_2721535251380436755[38] = 0;
+   out_2721535251380436755[39] = 0;
+   out_2721535251380436755[40] = 0;
+   out_2721535251380436755[41] = 0;
+   out_2721535251380436755[42] = 0;
+   out_2721535251380436755[43] = 0;
+   out_2721535251380436755[44] = 0;
+   out_2721535251380436755[45] = 0;
+   out_2721535251380436755[46] = 0;
+   out_2721535251380436755[47] = 0;
+   out_2721535251380436755[48] = 0;
+   out_2721535251380436755[49] = 0;
+   out_2721535251380436755[50] = 0;
+   out_2721535251380436755[51] = 0;
+   out_2721535251380436755[52] = 0;
+   out_2721535251380436755[53] = 0;
+   out_2721535251380436755[54] = 0;
+   out_2721535251380436755[55] = 0;
+   out_2721535251380436755[56] = 1;
+   out_2721535251380436755[57] = 0;
+   out_2721535251380436755[58] = 0;
+   out_2721535251380436755[59] = 0;
+   out_2721535251380436755[60] = 0;
+   out_2721535251380436755[61] = 0;
+   out_2721535251380436755[62] = 0;
+   out_2721535251380436755[63] = 0;
+   out_2721535251380436755[64] = 0;
+   out_2721535251380436755[65] = 0;
 }
-void h_33(double *state, double *unused, double *out_3687821174760154582) {
-   out_3687821174760154582[0] = state[16];
-   out_3687821174760154582[1] = state[17];
-   out_3687821174760154582[2] = state[18];
+void h_33(double *state, double *unused, double *out_1521077794722315231) {
+   out_1521077794722315231[0] = state[16];
+   out_1521077794722315231[1] = state[17];
+   out_1521077794722315231[2] = state[18];
 }
-void H_33(double *state, double *unused, double *out_3913595299924074648) {
-   out_3913595299924074648[0] = 0;
-   out_3913595299924074648[1] = 0;
-   out_3913595299924074648[2] = 0;
-   out_3913595299924074648[3] = 0;
-   out_3913595299924074648[4] = 0;
-   out_3913595299924074648[5] = 0;
-   out_3913595299924074648[6] = 0;
-   out_3913595299924074648[7] = 0;
-   out_3913595299924074648[8] = 0;
-   out_3913595299924074648[9] = 0;
-   out_3913595299924074648[10] = 0;
-   out_3913595299924074648[11] = 0;
-   out_3913595299924074648[12] = 0;
-   out_3913595299924074648[13] = 0;
-   out_3913595299924074648[14] = 0;
-   out_3913595299924074648[15] = 0;
-   out_3913595299924074648[16] = 1;
-   out_3913595299924074648[17] = 0;
-   out_3913595299924074648[18] = 0;
-   out_3913595299924074648[19] = 0;
-   out_3913595299924074648[20] = 0;
-   out_3913595299924074648[21] = 0;
-   out_3913595299924074648[22] = 0;
-   out_3913595299924074648[23] = 0;
-   out_3913595299924074648[24] = 0;
-   out_3913595299924074648[25] = 0;
-   out_3913595299924074648[26] = 0;
-   out_3913595299924074648[27] = 0;
-   out_3913595299924074648[28] = 0;
-   out_3913595299924074648[29] = 0;
-   out_3913595299924074648[30] = 0;
-   out_3913595299924074648[31] = 0;
-   out_3913595299924074648[32] = 0;
-   out_3913595299924074648[33] = 0;
-   out_3913595299924074648[34] = 0;
-   out_3913595299924074648[35] = 0;
-   out_3913595299924074648[36] = 0;
-   out_3913595299924074648[37] = 0;
-   out_3913595299924074648[38] = 0;
-   out_3913595299924074648[39] = 1;
-   out_3913595299924074648[40] = 0;
-   out_3913595299924074648[41] = 0;
-   out_3913595299924074648[42] = 0;
-   out_3913595299924074648[43] = 0;
-   out_3913595299924074648[44] = 0;
-   out_3913595299924074648[45] = 0;
-   out_3913595299924074648[46] = 0;
-   out_3913595299924074648[47] = 0;
-   out_3913595299924074648[48] = 0;
-   out_3913595299924074648[49] = 0;
-   out_3913595299924074648[50] = 0;
-   out_3913595299924074648[51] = 0;
-   out_3913595299924074648[52] = 0;
-   out_3913595299924074648[53] = 0;
-   out_3913595299924074648[54] = 0;
-   out_3913595299924074648[55] = 0;
-   out_3913595299924074648[56] = 0;
-   out_3913595299924074648[57] = 0;
-   out_3913595299924074648[58] = 0;
-   out_3913595299924074648[59] = 0;
-   out_3913595299924074648[60] = 0;
-   out_3913595299924074648[61] = 0;
-   out_3913595299924074648[62] = 1;
-   out_3913595299924074648[63] = 0;
-   out_3913595299924074648[64] = 0;
-   out_3913595299924074648[65] = 0;
+void H_33(double *state, double *unused, double *out_3491535124633419245) {
+   out_3491535124633419245[0] = 0;
+   out_3491535124633419245[1] = 0;
+   out_3491535124633419245[2] = 0;
+   out_3491535124633419245[3] = 0;
+   out_3491535124633419245[4] = 0;
+   out_3491535124633419245[5] = 0;
+   out_3491535124633419245[6] = 0;
+   out_3491535124633419245[7] = 0;
+   out_3491535124633419245[8] = 0;
+   out_3491535124633419245[9] = 0;
+   out_3491535124633419245[10] = 0;
+   out_3491535124633419245[11] = 0;
+   out_3491535124633419245[12] = 0;
+   out_3491535124633419245[13] = 0;
+   out_3491535124633419245[14] = 0;
+   out_3491535124633419245[15] = 0;
+   out_3491535124633419245[16] = 1;
+   out_3491535124633419245[17] = 0;
+   out_3491535124633419245[18] = 0;
+   out_3491535124633419245[19] = 0;
+   out_3491535124633419245[20] = 0;
+   out_3491535124633419245[21] = 0;
+   out_3491535124633419245[22] = 0;
+   out_3491535124633419245[23] = 0;
+   out_3491535124633419245[24] = 0;
+   out_3491535124633419245[25] = 0;
+   out_3491535124633419245[26] = 0;
+   out_3491535124633419245[27] = 0;
+   out_3491535124633419245[28] = 0;
+   out_3491535124633419245[29] = 0;
+   out_3491535124633419245[30] = 0;
+   out_3491535124633419245[31] = 0;
+   out_3491535124633419245[32] = 0;
+   out_3491535124633419245[33] = 0;
+   out_3491535124633419245[34] = 0;
+   out_3491535124633419245[35] = 0;
+   out_3491535124633419245[36] = 0;
+   out_3491535124633419245[37] = 0;
+   out_3491535124633419245[38] = 0;
+   out_3491535124633419245[39] = 1;
+   out_3491535124633419245[40] = 0;
+   out_3491535124633419245[41] = 0;
+   out_3491535124633419245[42] = 0;
+   out_3491535124633419245[43] = 0;
+   out_3491535124633419245[44] = 0;
+   out_3491535124633419245[45] = 0;
+   out_3491535124633419245[46] = 0;
+   out_3491535124633419245[47] = 0;
+   out_3491535124633419245[48] = 0;
+   out_3491535124633419245[49] = 0;
+   out_3491535124633419245[50] = 0;
+   out_3491535124633419245[51] = 0;
+   out_3491535124633419245[52] = 0;
+   out_3491535124633419245[53] = 0;
+   out_3491535124633419245[54] = 0;
+   out_3491535124633419245[55] = 0;
+   out_3491535124633419245[56] = 0;
+   out_3491535124633419245[57] = 0;
+   out_3491535124633419245[58] = 0;
+   out_3491535124633419245[59] = 0;
+   out_3491535124633419245[60] = 0;
+   out_3491535124633419245[61] = 0;
+   out_3491535124633419245[62] = 1;
+   out_3491535124633419245[63] = 0;
+   out_3491535124633419245[64] = 0;
+   out_3491535124633419245[65] = 0;
 }
 #include <eigen3/Eigen/Dense>
 #include <iostream>
@@ -1855,77 +1855,77 @@ void live_update_14(double *in_x, double *in_P, double *in_z, double *in_R, doub
 void live_update_33(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea) {
   update<3, 3, 0>(in_x, in_P, h_33, H_33, NULL, in_z, in_R, in_ea, MAHA_THRESH_33);
 }
-void live_H(double *in_vec, double *out_3981994659674141472) {
-  H(in_vec, out_3981994659674141472);
+void live_H(double *in_vec, double *out_2107061543090158966) {
+  H(in_vec, out_2107061543090158966);
 }
-void live_err_fun(double *nom_x, double *delta_x, double *out_3356596097038928074) {
-  err_fun(nom_x, delta_x, out_3356596097038928074);
+void live_err_fun(double *nom_x, double *delta_x, double *out_1090842864546838841) {
+  err_fun(nom_x, delta_x, out_1090842864546838841);
 }
-void live_inv_err_fun(double *nom_x, double *true_x, double *out_4391465575185495497) {
-  inv_err_fun(nom_x, true_x, out_4391465575185495497);
+void live_inv_err_fun(double *nom_x, double *true_x, double *out_1751534880763809428) {
+  inv_err_fun(nom_x, true_x, out_1751534880763809428);
 }
-void live_H_mod_fun(double *state, double *out_4990766548554672415) {
-  H_mod_fun(state, out_4990766548554672415);
+void live_H_mod_fun(double *state, double *out_2270168032272230264) {
+  H_mod_fun(state, out_2270168032272230264);
 }
-void live_f_fun(double *state, double dt, double *out_3056772812413117361) {
-  f_fun(state,  dt, out_3056772812413117361);
+void live_f_fun(double *state, double dt, double *out_9047640957774126431) {
+  f_fun(state,  dt, out_9047640957774126431);
 }
-void live_F_fun(double *state, double dt, double *out_3001170024940786206) {
-  F_fun(state,  dt, out_3001170024940786206);
+void live_F_fun(double *state, double dt, double *out_4752414459068816126) {
+  F_fun(state,  dt, out_4752414459068816126);
 }
-void live_h_4(double *state, double *unused, double *out_4623444193655221191) {
-  h_4(state, unused, out_4623444193655221191);
+void live_h_4(double *state, double *unused, double *out_1938047718740512528) {
+  h_4(state, unused, out_1938047718740512528);
 }
-void live_H_4(double *state, double *unused, double *out_2603623762087390332) {
-  H_4(state, unused, out_2603623762087390332);
+void live_H_4(double *state, double *unused, double *out_8437989887064667391) {
+  H_4(state, unused, out_8437989887064667391);
 }
-void live_h_9(double *state, double *unused, double *out_4168973980757166041) {
-  h_9(state, unused, out_4168973980757166041);
+void live_h_9(double *state, double *unused, double *out_2016376091952434025) {
+  h_9(state, unused, out_2016376091952434025);
 }
-void live_H_9(double *state, double *unused, double *out_2362434115457799687) {
-  H_9(state, unused, out_2362434115457799687);
+void live_H_9(double *state, double *unused, double *out_2721535251380436755) {
+  H_9(state, unused, out_2721535251380436755);
 }
-void live_h_10(double *state, double *unused, double *out_3520412221597307166) {
-  h_10(state, unused, out_3520412221597307166);
+void live_h_10(double *state, double *unused, double *out_8252027734007822314) {
+  h_10(state, unused, out_8252027734007822314);
 }
-void live_H_10(double *state, double *unused, double *out_7396015770213526348) {
-  H_10(state, unused, out_7396015770213526348);
+void live_H_10(double *state, double *unused, double *out_1022365631619946756) {
+  H_10(state, unused, out_1022365631619946756);
 }
-void live_h_12(double *state, double *unused, double *out_7977792700499542139) {
-  h_12(state, unused, out_7977792700499542139);
+void live_h_12(double *state, double *unused, double *out_490832941153373832) {
+  h_12(state, unused, out_490832941153373832);
 }
-void live_H_12(double *state, double *unused, double *out_2415832645944571463) {
-  H_12(state, unused, out_2415832645944571463);
+void live_H_12(double *state, double *unused, double *out_4989297778612922430) {
+  H_12(state, unused, out_4989297778612922430);
 }
-void live_h_35(double *state, double *unused, double *out_3752355986187417342) {
-  h_35(state, unused, out_3752355986187417342);
+void live_h_35(double *state, double *unused, double *out_851812883202032952) {
+  h_35(state, unused, out_851812883202032952);
 }
-void live_H_35(double *state, double *unused, double *out_763038295285217044) {
-  H_35(state, unused, out_763038295285217044);
+void live_H_35(double *state, double *unused, double *out_6642092129272276849) {
+  H_35(state, unused, out_6642092129272276849);
 }
-void live_h_32(double *state, double *unused, double *out_2897039262415537399) {
-  h_32(state, unused, out_2897039262415537399);
+void live_h_32(double *state, double *unused, double *out_7198045605532929596) {
+  h_32(state, unused, out_7198045605532929596);
 }
-void live_H_32(double *state, double *unused, double *out_6564342667492829602) {
-  H_32(state, unused, out_6564342667492829602);
+void live_H_32(double *state, double *unused, double *out_6510927344331536380) {
+  H_32(state, unused, out_6510927344331536380);
 }
-void live_h_13(double *state, double *unused, double *out_7535737061045930452) {
-  h_13(state, unused, out_7535737061045930452);
+void live_h_13(double *state, double *unused, double *out_6813957582124674447) {
+  h_13(state, unused, out_6813957582124674447);
 }
-void live_H_13(double *state, double *unused, double *out_3042894167287587122) {
-  H_13(state, unused, out_3042894167287587122);
+void live_H_13(double *state, double *unused, double *out_7851984426394690165) {
+  H_13(state, unused, out_7851984426394690165);
 }
-void live_h_14(double *state, double *unused, double *out_4168973980757166041) {
-  h_14(state, unused, out_4168973980757166041);
+void live_h_14(double *state, double *unused, double *out_2016376091952434025) {
+  h_14(state, unused, out_2016376091952434025);
 }
-void live_H_14(double *state, double *unused, double *out_2362434115457799687) {
-  H_14(state, unused, out_2362434115457799687);
+void live_H_14(double *state, double *unused, double *out_2721535251380436755) {
+  H_14(state, unused, out_2721535251380436755);
 }
-void live_h_33(double *state, double *unused, double *out_3687821174760154582) {
-  h_33(state, unused, out_3687821174760154582);
+void live_h_33(double *state, double *unused, double *out_1521077794722315231) {
+  h_33(state, unused, out_1521077794722315231);
 }
-void live_H_33(double *state, double *unused, double *out_3913595299924074648) {
-  H_33(state, unused, out_3913595299924074648);
+void live_H_33(double *state, double *unused, double *out_3491535124633419245) {
+  H_33(state, unused, out_3491535124633419245);
 }
 void live_predict(double *in_x, double *in_P, double *in_Q, double dt) {
   predict(in_x, in_P, in_Q, dt);
diff --git a/selfdrive/locationd/models/generated/live.h b/selfdrive/locationd/models/generated/live.h
index de0899823..2c8518a9c 100644
--- a/selfdrive/locationd/models/generated/live.h
+++ b/selfdrive/locationd/models/generated/live.h
@@ -10,29 +10,29 @@ void live_update_32(double *in_x, double *in_P, double *in_z, double *in_R, doub
 void live_update_13(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea);
 void live_update_14(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea);
 void live_update_33(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea);
-void live_H(double *in_vec, double *out_3981994659674141472);
-void live_err_fun(double *nom_x, double *delta_x, double *out_3356596097038928074);
-void live_inv_err_fun(double *nom_x, double *true_x, double *out_4391465575185495497);
-void live_H_mod_fun(double *state, double *out_4990766548554672415);
-void live_f_fun(double *state, double dt, double *out_3056772812413117361);
-void live_F_fun(double *state, double dt, double *out_3001170024940786206);
-void live_h_4(double *state, double *unused, double *out_4623444193655221191);
-void live_H_4(double *state, double *unused, double *out_2603623762087390332);
-void live_h_9(double *state, double *unused, double *out_4168973980757166041);
-void live_H_9(double *state, double *unused, double *out_2362434115457799687);
-void live_h_10(double *state, double *unused, double *out_3520412221597307166);
-void live_H_10(double *state, double *unused, double *out_7396015770213526348);
-void live_h_12(double *state, double *unused, double *out_7977792700499542139);
-void live_H_12(double *state, double *unused, double *out_2415832645944571463);
-void live_h_35(double *state, double *unused, double *out_3752355986187417342);
-void live_H_35(double *state, double *unused, double *out_763038295285217044);
-void live_h_32(double *state, double *unused, double *out_2897039262415537399);
-void live_H_32(double *state, double *unused, double *out_6564342667492829602);
-void live_h_13(double *state, double *unused, double *out_7535737061045930452);
-void live_H_13(double *state, double *unused, double *out_3042894167287587122);
-void live_h_14(double *state, double *unused, double *out_4168973980757166041);
-void live_H_14(double *state, double *unused, double *out_2362434115457799687);
-void live_h_33(double *state, double *unused, double *out_3687821174760154582);
-void live_H_33(double *state, double *unused, double *out_3913595299924074648);
+void live_H(double *in_vec, double *out_2107061543090158966);
+void live_err_fun(double *nom_x, double *delta_x, double *out_1090842864546838841);
+void live_inv_err_fun(double *nom_x, double *true_x, double *out_1751534880763809428);
+void live_H_mod_fun(double *state, double *out_2270168032272230264);
+void live_f_fun(double *state, double dt, double *out_9047640957774126431);
+void live_F_fun(double *state, double dt, double *out_4752414459068816126);
+void live_h_4(double *state, double *unused, double *out_1938047718740512528);
+void live_H_4(double *state, double *unused, double *out_8437989887064667391);
+void live_h_9(double *state, double *unused, double *out_2016376091952434025);
+void live_H_9(double *state, double *unused, double *out_2721535251380436755);
+void live_h_10(double *state, double *unused, double *out_8252027734007822314);
+void live_H_10(double *state, double *unused, double *out_1022365631619946756);
+void live_h_12(double *state, double *unused, double *out_490832941153373832);
+void live_H_12(double *state, double *unused, double *out_4989297778612922430);
+void live_h_35(double *state, double *unused, double *out_851812883202032952);
+void live_H_35(double *state, double *unused, double *out_6642092129272276849);
+void live_h_32(double *state, double *unused, double *out_7198045605532929596);
+void live_H_32(double *state, double *unused, double *out_6510927344331536380);
+void live_h_13(double *state, double *unused, double *out_6813957582124674447);
+void live_H_13(double *state, double *unused, double *out_7851984426394690165);
+void live_h_14(double *state, double *unused, double *out_2016376091952434025);
+void live_H_14(double *state, double *unused, double *out_2721535251380436755);
+void live_h_33(double *state, double *unused, double *out_1521077794722315231);
+void live_H_33(double *state, double *unused, double *out_3491535124633419245);
 void live_predict(double *in_x, double *in_P, double *in_Q, double dt);
 }
\ No newline at end of file
diff --git a/selfdrive/modeld/_dmonitoringmodeld b/selfdrive/modeld/_dmonitoringmodeld
index 48345d0d4..400c21ebb 100755
Binary files a/selfdrive/modeld/_dmonitoringmodeld and b/selfdrive/modeld/_dmonitoringmodeld differ
diff --git a/selfdrive/modeld/_modeld b/selfdrive/modeld/_modeld
index 91eb77beb..1d572b772 100755
Binary files a/selfdrive/modeld/_modeld and b/selfdrive/modeld/_modeld differ
diff --git a/selfdrive/modeld/_navmodeld b/selfdrive/modeld/_navmodeld
index ffdd6dffb..ad724a539 100755
Binary files a/selfdrive/modeld/_navmodeld and b/selfdrive/modeld/_navmodeld differ
diff --git a/selfdrive/modeld/models/supercombo.thneed b/selfdrive/modeld/models/supercombo.thneed
index fbab8ceea..05bbfae48 100644
Binary files a/selfdrive/modeld/models/supercombo.thneed and b/selfdrive/modeld/models/supercombo.thneed differ
diff --git a/selfdrive/navd/libmaprender.so b/selfdrive/navd/libmaprender.so
index a68ec7861..c23d81f9b 100755
Binary files a/selfdrive/navd/libmaprender.so and b/selfdrive/navd/libmaprender.so differ
diff --git a/selfdrive/ui/_ui b/selfdrive/ui/_ui
index 09b73ef6e..fe5ef10da 100755
Binary files a/selfdrive/ui/_ui and b/selfdrive/ui/_ui differ
diff --git a/selfdrive/ui/qt/spinner b/selfdrive/ui/qt/spinner
index 31c657d43..1c6a966e6 100755
Binary files a/selfdrive/ui/qt/spinner and b/selfdrive/ui/qt/spinner differ
diff --git a/selfdrive/ui/qt/text b/selfdrive/ui/qt/text
index 9f689b22a..07b4fb6e1 100755
Binary files a/selfdrive/ui/qt/text and b/selfdrive/ui/qt/text differ
diff --git a/selfdrive/ui/soundd/_soundd b/selfdrive/ui/soundd/_soundd
index ab3f55496..2bcd2fa09 100755
Binary files a/selfdrive/ui/soundd/_soundd and b/selfdrive/ui/soundd/_soundd differ
diff --git a/selfdrive/ui/translations/main_de.ts b/selfdrive/ui/translations/main_de.ts
index 770748ec6..b3f31afee 100644
--- a/selfdrive/ui/translations/main_de.ts
+++ b/selfdrive/ui/translations/main_de.ts
@@ -362,6 +362,14 @@ NOR - Normal tune.
 SPT - Sport tune.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>*β* Enable Otisserv</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When enabled, you will be able to access some features remotely through dragonpilot.org.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Enable Stock Longitudinal Control</source>
         <translation type="unfinished"></translation>
@@ -371,14 +379,6 @@ SPT - Sport tune.</source>
 Reboot Required.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>*β* Enable Otisserv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When enabled, you will be able to access some features remotely through dragonpilot.org.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DeclinePage</name>
diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts
index 66ec2d8e6..c8ae54193 100644
--- a/selfdrive/ui/translations/main_ja.ts
+++ b/selfdrive/ui/translations/main_ja.ts
@@ -362,6 +362,14 @@ NOR - Normal tune.
 SPT - Sport tune.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>*β* Enable Otisserv</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When enabled, you will be able to access some features remotely through dragonpilot.org.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Enable Stock Longitudinal Control</source>
         <translation type="unfinished"></translation>
@@ -371,14 +379,6 @@ SPT - Sport tune.</source>
 Reboot Required.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>*β* Enable Otisserv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When enabled, you will be able to access some features remotely through dragonpilot.org.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DeclinePage</name>
diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts
index 3c3a346a0..27c5da6a5 100644
--- a/selfdrive/ui/translations/main_ko.ts
+++ b/selfdrive/ui/translations/main_ko.ts
@@ -362,6 +362,14 @@ NOR - Normal tune.
 SPT - Sport tune.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>*β* Enable Otisserv</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When enabled, you will be able to access some features remotely through dragonpilot.org.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Enable Stock Longitudinal Control</source>
         <translation type="unfinished"></translation>
@@ -371,14 +379,6 @@ SPT - Sport tune.</source>
 Reboot Required.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>*β* Enable Otisserv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When enabled, you will be able to access some features remotely through dragonpilot.org.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DeclinePage</name>
diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts
index ac3ccbd72..de420c29c 100644
--- a/selfdrive/ui/translations/main_pt-BR.ts
+++ b/selfdrive/ui/translations/main_pt-BR.ts
@@ -362,6 +362,14 @@ NOR - Normal tune.
 SPT - Sport tune.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>*β* Enable Otisserv</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When enabled, you will be able to access some features remotely through dragonpilot.org.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Enable Stock Longitudinal Control</source>
         <translation type="unfinished"></translation>
@@ -371,14 +379,6 @@ SPT - Sport tune.</source>
 Reboot Required.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>*β* Enable Otisserv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When enabled, you will be able to access some features remotely through dragonpilot.org.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DeclinePage</name>
diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts
index 4d4bcb097..660568f53 100644
--- a/selfdrive/ui/translations/main_zh-CHS.ts
+++ b/selfdrive/ui/translations/main_zh-CHS.ts
@@ -362,6 +362,14 @@ NOR - Normal tune.
 SPT - Sport tune.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>*β* Enable Otisserv</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When enabled, you will be able to access some features remotely through dragonpilot.org.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Enable Stock Longitudinal Control</source>
         <translation type="unfinished"></translation>
@@ -371,14 +379,6 @@ SPT - Sport tune.</source>
 Reboot Required.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>*β* Enable Otisserv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When enabled, you will be able to access some features remotely through dragonpilot.org.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DeclinePage</name>
diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts
index 13cfbc419..d7dd03db8 100644
--- a/selfdrive/ui/translations/main_zh-CHT.ts
+++ b/selfdrive/ui/translations/main_zh-CHT.ts
@@ -362,6 +362,14 @@ NOR - Normal tune.
 SPT - Sport tune.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>*β* Enable Otisserv</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When enabled, you will be able to access some features remotely through dragonpilot.org.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Enable Stock Longitudinal Control</source>
         <translation type="unfinished"></translation>
@@ -371,14 +379,6 @@ SPT - Sport tune.</source>
 Reboot Required.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>*β* Enable Otisserv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When enabled, you will be able to access some features remotely through dragonpilot.org.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DeclinePage</name>
diff --git a/system/camerad/camerad b/system/camerad/camerad
index bffe09ab5..4ddbfe88b 100755
Binary files a/system/camerad/camerad and b/system/camerad/camerad differ
diff --git a/system/clocksd/clocksd b/system/clocksd/clocksd
index db965d721..66282c454 100755
Binary files a/system/clocksd/clocksd and b/system/clocksd/clocksd differ
diff --git a/system/logcatd/logcatd b/system/logcatd/logcatd
index 3225cdd8d..551da1120 100755
Binary files a/system/logcatd/logcatd and b/system/logcatd/logcatd differ
diff --git a/system/loggerd/bootlog b/system/loggerd/bootlog
index 7f40f3cd2..4d6c14145 100755
Binary files a/system/loggerd/bootlog and b/system/loggerd/bootlog differ
diff --git a/system/loggerd/encoderd b/system/loggerd/encoderd
index 7ebf1489f..18f6ea473 100755
Binary files a/system/loggerd/encoderd and b/system/loggerd/encoderd differ
diff --git a/system/loggerd/loggerd b/system/loggerd/loggerd
index ada0938bd..03ca024c0 100755
Binary files a/system/loggerd/loggerd and b/system/loggerd/loggerd differ
diff --git a/system/proclogd/proclogd b/system/proclogd/proclogd
index bd3e36126..2d91ac4cb 100755
Binary files a/system/proclogd/proclogd and b/system/proclogd/proclogd differ
diff --git a/system/sensord/_sensord b/system/sensord/_sensord
index d64a6f350..9d4481f57 100755
Binary files a/system/sensord/_sensord and b/system/sensord/_sensord differ
diff --git a/system/ubloxd/ubloxd b/system/ubloxd/ubloxd
index eb2ae7921..8030f70c1 100755
Binary files a/system/ubloxd/ubloxd and b/system/ubloxd/ubloxd differ
diff --git a/third_party/acados/acados_template/__pycache__/__init__.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/__init__.cpython-311.pyc
index f5990aacd..3582cc18c 100644
Binary files a/third_party/acados/acados_template/__pycache__/__init__.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/__init__.cpython-311.pyc differ
diff --git a/third_party/acados/acados_template/__pycache__/acados_model.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/acados_model.cpython-311.pyc
index a34d17a52..be447a556 100644
Binary files a/third_party/acados/acados_template/__pycache__/acados_model.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/acados_model.cpython-311.pyc differ
diff --git a/third_party/acados/acados_template/__pycache__/acados_ocp.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/acados_ocp.cpython-311.pyc
index aeb1872b7..b210bc0f4 100644
Binary files a/third_party/acados/acados_template/__pycache__/acados_ocp.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/acados_ocp.cpython-311.pyc differ
diff --git a/third_party/acados/acados_template/__pycache__/acados_ocp_solver.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/acados_ocp_solver.cpython-311.pyc
index e4e67f72b..43fd69ed6 100644
Binary files a/third_party/acados/acados_template/__pycache__/acados_ocp_solver.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/acados_ocp_solver.cpython-311.pyc differ
diff --git a/third_party/acados/acados_template/__pycache__/acados_sim.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/acados_sim.cpython-311.pyc
index 5dc39a8f9..af2fd553d 100644
Binary files a/third_party/acados/acados_template/__pycache__/acados_sim.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/acados_sim.cpython-311.pyc differ
diff --git a/third_party/acados/acados_template/__pycache__/acados_sim_solver.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/acados_sim_solver.cpython-311.pyc
index d817e3147..d2d2fd611 100644
Binary files a/third_party/acados/acados_template/__pycache__/acados_sim_solver.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/acados_sim_solver.cpython-311.pyc differ
diff --git a/third_party/acados/acados_template/__pycache__/builders.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/builders.cpython-311.pyc
index f838efcb9..14464437f 100644
Binary files a/third_party/acados/acados_template/__pycache__/builders.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/builders.cpython-311.pyc differ
diff --git a/third_party/acados/acados_template/__pycache__/generate_c_code_constraint.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/generate_c_code_constraint.cpython-311.pyc
index 99a8c2fe0..5b33866c2 100644
Binary files a/third_party/acados/acados_template/__pycache__/generate_c_code_constraint.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/generate_c_code_constraint.cpython-311.pyc differ
diff --git a/third_party/acados/acados_template/__pycache__/generate_c_code_discrete_dynamics.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/generate_c_code_discrete_dynamics.cpython-311.pyc
index 61861b818..940fd2547 100644
Binary files a/third_party/acados/acados_template/__pycache__/generate_c_code_discrete_dynamics.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/generate_c_code_discrete_dynamics.cpython-311.pyc differ
diff --git a/third_party/acados/acados_template/__pycache__/generate_c_code_explicit_ode.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/generate_c_code_explicit_ode.cpython-311.pyc
index ba5db6036..3eceeaeb3 100644
Binary files a/third_party/acados/acados_template/__pycache__/generate_c_code_explicit_ode.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/generate_c_code_explicit_ode.cpython-311.pyc differ
diff --git a/third_party/acados/acados_template/__pycache__/generate_c_code_external_cost.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/generate_c_code_external_cost.cpython-311.pyc
index 3ad22d294..3411f9201 100644
Binary files a/third_party/acados/acados_template/__pycache__/generate_c_code_external_cost.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/generate_c_code_external_cost.cpython-311.pyc differ
diff --git a/third_party/acados/acados_template/__pycache__/generate_c_code_gnsf.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/generate_c_code_gnsf.cpython-311.pyc
index 1cb7a7e8f..726f8ec12 100644
Binary files a/third_party/acados/acados_template/__pycache__/generate_c_code_gnsf.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/generate_c_code_gnsf.cpython-311.pyc differ
diff --git a/third_party/acados/acados_template/__pycache__/generate_c_code_implicit_ode.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/generate_c_code_implicit_ode.cpython-311.pyc
index 3aa8ddb9a..06a2c0886 100644
Binary files a/third_party/acados/acados_template/__pycache__/generate_c_code_implicit_ode.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/generate_c_code_implicit_ode.cpython-311.pyc differ
diff --git a/third_party/acados/acados_template/__pycache__/generate_c_code_nls_cost.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/generate_c_code_nls_cost.cpython-311.pyc
index 0d178eeaf..d8c1487a4 100644
Binary files a/third_party/acados/acados_template/__pycache__/generate_c_code_nls_cost.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/generate_c_code_nls_cost.cpython-311.pyc differ
diff --git a/third_party/acados/acados_template/__pycache__/utils.cpython-311.pyc b/third_party/acados/acados_template/__pycache__/utils.cpython-311.pyc
index 4f5c33001..bee25fb04 100644
Binary files a/third_party/acados/acados_template/__pycache__/utils.cpython-311.pyc and b/third_party/acados/acados_template/__pycache__/utils.cpython-311.pyc differ
diff --git a/tools/bodyteleop/__pycache__/bodyav.cpython-311.pyc b/tools/bodyteleop/__pycache__/bodyav.cpython-311.pyc
index ce6d09e72..695c36a6c 100644
Binary files a/tools/bodyteleop/__pycache__/bodyav.cpython-311.pyc and b/tools/bodyteleop/__pycache__/bodyav.cpython-311.pyc differ
diff --git a/tools/bodyteleop/__pycache__/web.cpython-311.pyc b/tools/bodyteleop/__pycache__/web.cpython-311.pyc
index 8bd56b222..145ff0a09 100644
Binary files a/tools/bodyteleop/__pycache__/web.cpython-311.pyc and b/tools/bodyteleop/__pycache__/web.cpython-311.pyc differ