diff --git a/cppbuild.bash b/cppbuild.bash
index ee6c665..d43900a 100755
--- a/cppbuild.bash
+++ b/cppbuild.bash
@@ -8,7 +8,7 @@ cd cppbuild
 
 # Clone the ability-hand-api repo, if it's not already here
 if [ ! -d ability-hand-api ]; then
-  git clone -b split-read-write-v2 https://github.com/ihmcrobotics/ability-hand-api.git ability-hand-api
+  git clone -b multi-hand-support https://github.com/ihmcrobotics/ability-hand-api.git ability-hand-api
 fi
 
 cd ability-hand-api/cpp
diff --git a/src/main/java/us/ihmc/abilityhand/AbilityHandJavaAPIConfig.java b/src/main/java/us/ihmc/abilityhand/AbilityHandJavaAPIConfig.java
index 76edeea..42c56df 100644
--- a/src/main/java/us/ihmc/abilityhand/AbilityHandJavaAPIConfig.java
+++ b/src/main/java/us/ihmc/abilityhand/AbilityHandJavaAPIConfig.java
@@ -13,6 +13,14 @@
             link = "ability_hand_api",
             linkpath = "install/lib",
             preload = "jniabilityhand"
+      ),
+      @Platform(
+            value = "linux",
+            define = "PLATFORM_LINUX"
+      ),
+      @Platform(
+            value = "windows",
+            define = "PLATFORM_WINDOWS"
       )},
       target = "us.ihmc.abilityhand",
       global = "us.ihmc.abilityhand.global.abilityhand"
@@ -27,6 +35,7 @@ public void map(InfoMap infoMap)
              .put(new Info("std::array<uint16_t,30>").pointerTypes("UInt16Array30").define())
              // Hand field of AHWrapper is read-only. Code adapted from here:
              // https://github.com/bytedeco/javacpp/wiki/Mapping-Recipes#mapping-a-declaration-to-custom-code
-             .put(new Info("AHWrapper::hand").javaText("public native @MemberGetter @Const @ByRef Hand hand();"));
+             .put(new Info("AHWrapper::hand").javaText("public native @MemberGetter @Const @ByRef Hand hand();"))
+             .put(new Info("AHSerial").skip());
    }
 }
diff --git a/src/main/java/us/ihmc/abilityhand/global/abilityhand.java b/src/main/java/us/ihmc/abilityhand/global/abilityhand.java
index 0fcf827..ce11dae 100644
--- a/src/main/java/us/ihmc/abilityhand/global/abilityhand.java
+++ b/src/main/java/us/ihmc/abilityhand/global/abilityhand.java
@@ -40,6 +40,7 @@ public class abilityhand extends us.ihmc.abilityhand.AbilityHandJavaAPIConfig {
 
 
 
+
 // Parsed from hand.h
 
 // #pragma once
diff --git a/src/main/resources/abilityhand/native/linux-x86_64/libability_hand_api.so b/src/main/resources/abilityhand/native/linux-x86_64/libability_hand_api.so
index 427de9f..d0fe7b5 100644
Binary files a/src/main/resources/abilityhand/native/linux-x86_64/libability_hand_api.so and b/src/main/resources/abilityhand/native/linux-x86_64/libability_hand_api.so differ
diff --git a/src/main/resources/abilityhand/native/linux-x86_64/libjniabilityhand.so b/src/main/resources/abilityhand/native/linux-x86_64/libjniabilityhand.so
index d6b38d7..8df58a3 100755
Binary files a/src/main/resources/abilityhand/native/linux-x86_64/libjniabilityhand.so and b/src/main/resources/abilityhand/native/linux-x86_64/libjniabilityhand.so differ