diff --git a/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m b/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
index 3e23129d48f..70678ac2854 100644
--- a/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
+++ b/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
@@ -266,19 +266,12 @@ - (void)testNodeValueListenerIfListening
   XCTAssertEqual(observer.calls.count, 7UL);
 }
 
-- (void)testSpringAnimation
+- (void)performSpringAnimationTestWithConfig:(NSDictionary*)config isCriticallyDamped:(BOOL)testForCriticallyDamped
 {
   [self createSimpleAnimatedView:@1000 withOpacity:0];
   [_nodesManager startAnimatingNode:@1
                             nodeTag:@1
-                             config:@{@"type": @"spring",
-                                      @"friction": @7,
-                                      @"tension": @40,
-                                      @"initialVelocity": @0,
-                                      @"toValue": @1,
-                                      @"restSpeedThreshold": @0.001,
-                                      @"restDisplacementThreshold": @0.001,
-                                      @"overshootClamping": @NO}
+                             config:config
                         endCallback:nil];
 
   BOOL wasGreaterThanOne = NO;
@@ -299,7 +292,7 @@ - (void)testSpringAnimation
     }
 
     // Verify that animation step is relatively small.
-    XCTAssertLessThan(fabs(currentValue - previousValue), 0.1);
+    XCTAssertLessThan(fabs(currentValue - previousValue), 0.12);
 
     previousValue = currentValue;
   }
@@ -308,13 +301,45 @@ - (void)testSpringAnimation
   XCTAssertEqual(previousValue, 1.0);
 
   // Verify that value has reached some maximum value that is greater than the final value (bounce).
-  XCTAssertTrue(wasGreaterThanOne);
+  if (testForCriticallyDamped) {
+    XCTAssertFalse(wasGreaterThanOne);
+  } else {
+    XCTAssertTrue(wasGreaterThanOne);
+  }
 
   [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
   [_nodesManager stepAnimations:_displayLink];
   [_uiManager verify];
 }
 
+- (void)testUnderdampedSpringAnimation
+{
+  [self performSpringAnimationTestWithConfig:@{@"type": @"spring",
+                                               @"stiffness": @230.3,
+                                               @"damping": @22,
+                                               @"mass": @1,
+                                               @"initialVelocity": @0,
+                                               @"toValue": @1,
+                                               @"restSpeedThreshold": @0.001,
+                                               @"restDisplacementThreshold": @0.001,
+                                               @"overshootClamping": @NO}
+                          isCriticallyDamped:NO];
+}
+
+- (void)testCritcallyDampedSpringAnimation
+{
+  [self performSpringAnimationTestWithConfig:@{@"type": @"spring",
+                                               @"stiffness": @1000,
+                                               @"damping": @500,
+                                               @"mass": @3,
+                                               @"initialVelocity": @0,
+                                               @"toValue": @1,
+                                               @"restSpeedThreshold": @0.001,
+                                               @"restDisplacementThreshold": @0.001,
+                                               @"overshootClamping": @NO}
+                          isCriticallyDamped:YES];
+}
+
 - (void)testDecayAnimation
 {
   [self createSimpleAnimatedView:@1000 withOpacity:0];
@@ -415,15 +440,16 @@ - (void)testSpringAnimationLoop
                             nodeTag:@1
                              config:@{@"type": @"spring",
                                       @"iterations": @5,
-                                      @"friction": @7,
-                                      @"tension": @40,
+                                      @"stiffness": @230.2,
+                                      @"damping": @22,
+                                      @"mass": @1,
                                       @"initialVelocity": @0,
                                       @"toValue": @1,
                                       @"restSpeedThreshold": @0.001,
                                       @"restDisplacementThreshold": @0.001,
                                       @"overshootClamping": @NO}
                         endCallback:nil];
-
+  
   BOOL didComeToRest = NO;
   CGFloat previousValue = 0;
   NSUInteger numberOfResets = 0;
@@ -433,32 +459,32 @@ - (void)testSpringAnimationLoop
     [invocation getArgument:&props atIndex:4];
     currentValue = props[@"opacity"].doubleValue;
   }] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
-
+  
   // Run for 3 seconds five times.
   for (NSUInteger i = 0; i < 3 * 60 * 5; i++) {
     [_nodesManager stepAnimations:_displayLink];
-
+    
     if (!didComeToRest) {
       // Verify that animation step is relatively small.
-      XCTAssertLessThan(fabs(currentValue - previousValue), 0.1);
+      XCTAssertLessThan(fabs(currentValue - previousValue), 0.12);
     }
-
+    
     // Test to see if it reset after coming to rest
     if (didComeToRest && currentValue == 0) {
       didComeToRest = NO;
       numberOfResets++;
     }
-
+    
     // Record that the animation did come to rest when it rests on toValue.
     didComeToRest = fabs(currentValue - 1) < 0.001 && fabs(currentValue - previousValue) < 0.001;
-
+    
     previousValue = currentValue;
   }
-
+  
   // Verify that value reset 4 times after finishing a full animation and is currently resting.
   XCTAssertEqual(numberOfResets, 4u);
   XCTAssertTrue(didComeToRest);
-
+  
   [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
   [_nodesManager stepAnimations:_displayLink];
   [_uiManager verify];
diff --git a/js/AnimatedGratuitousApp/AnExChained.js b/js/AnimatedGratuitousApp/AnExChained.js
index d59ae58c9f6..124ed34e23a 100644
--- a/js/AnimatedGratuitousApp/AnExChained.js
+++ b/js/AnimatedGratuitousApp/AnExChained.js
@@ -73,7 +73,7 @@ class AnExChained extends React.Component<Object, any> {
             <Animated.Image
               {...handlers}
               key={i}
-              source={{uri: CHAIN_IMGS[j]}}
+              source={CHAIN_IMGS[j]}
               style={[styles.sticker, {
                 transform: this.state.stickers[j].getTranslateTransform(), // simple conversion
               }]}
@@ -100,11 +100,11 @@ var styles = StyleSheet.create({
 });
 
 var CHAIN_IMGS = [
-  'https://scontent-sea1-1.xx.fbcdn.net/hphotos-xpf1/t39.1997-6/p160x160/10574705_1529175770666007_724328156_n.png',
-  'https://fbcdn-dragon-a.akamaihd.net/hphotos-ak-xfa1/t39.1997-6/p160x160/851575_392309884199657_1917957497_n.png',
-  'https://fbcdn-dragon-a.akamaihd.net/hphotos-ak-xfa1/t39.1997-6/p160x160/851567_555288911225630_1628791128_n.png',
-  'https://scontent-sea1-1.xx.fbcdn.net/hphotos-xfa1/t39.1997-6/p160x160/851583_531111513625557_903469595_n.png',
-  'https://scontent-sea1-1.xx.fbcdn.net/hphotos-xpa1/t39.1997-6/p160x160/851577_510515972354399_2147096990_n.png',
+  require('../hawk.png'),
+  require('../bunny.png'),
+  require('../relay.png'),
+  require('../hawk.png'),
+  require('../bunny.png')
 ];
 
 module.exports = AnExChained;
diff --git a/js/NativeAnimationsExample.js b/js/NativeAnimationsExample.js
index 8cf41be3e81..e6baeb4ef81 100644
--- a/js/NativeAnimationsExample.js
+++ b/js/NativeAnimationsExample.js
@@ -429,7 +429,7 @@ exports.examples = [
     },
   },
   {
-    title: 'translateX => Animated.spring',
+    title: 'translateX => Animated.spring (bounciness/speed)',
     render: function() {
       return (
         <Tester type="spring" config={{bounciness: 0}}>
@@ -454,6 +454,32 @@ exports.examples = [
       );
     },
   },
+  {
+    title: 'translateX => Animated.spring (stiffness/damping/mass)',
+    render: function() {
+      return (
+        <Tester type="spring" config={{stiffness: 1000, damping: 500, mass: 3 }}>
+          {anim => (
+            <Animated.View
+              style={[
+                styles.block,
+                {
+                  transform: [
+                    {
+                      translateX: anim.interpolate({
+                        inputRange: [0, 1],
+                        outputRange: [0, 100],
+                      }),
+                    },
+                  ],
+                },
+              ]}
+            />
+          )}
+        </Tester>
+      );
+    },
+  },
   {
     title: 'translateX => Animated.decay',
     render: function() {