diff --git a/src/monocoque/simulatorapi/CMakeLists.txt b/src/monocoque/simulatorapi/CMakeLists.txt
index e461c8e..7ac5c1b 100644
--- a/src/monocoque/simulatorapi/CMakeLists.txt
+++ b/src/monocoque/simulatorapi/CMakeLists.txt
@@ -9,6 +9,7 @@ set(simulatorapi_source_files
   simapi/include/dirt2data.h
   simapi/include/scs2data.h
   simapi/include/outgauge.h
+  simapi/include/f12018.h
   simapi/simmap/basicmap.h
   simapi/simmap/mapacdata.c
   simapi/simmap/mapacdata.h
@@ -18,12 +19,14 @@ set(simulatorapi_source_files
   simapi/simapi/pcars2.h
   simapi/simapi/scs2.h
   simapi/simapi/outgauge.h
+  simapi/simapi/f1.h
   simapi/simapi/mapping/acmapper.c
   simapi/simapi/mapping/rf2mapper.c
   simapi/simapi/mapping/pcars2mapper.c
   simapi/simapi/mapping/dirt2mapper.c
   simapi/simapi/mapping/scs2mapper.c
   simapi/simapi/mapping/outgaugemapper.c
+  simapi/simapi/mapping/f12018mapper.c
   simapi/simapi/getpid.c
   simapi/simapi/getpid.h
 )
diff --git a/src/monocoque/simulatorapi/simapi b/src/monocoque/simulatorapi/simapi
index 3410864..8d8ec24 160000
--- a/src/monocoque/simulatorapi/simapi
+++ b/src/monocoque/simulatorapi/simapi
@@ -1 +1 @@
-Subproject commit 3410864cc9d5e4f8311bec04ceded68324ed0c65
+Subproject commit 8d8ec24725ec28ec81f50e339ec09536695d76b3