diff --git a/Examples/HeroExamples.xcodeproj/project.pbxproj b/Examples/HeroExamples.xcodeproj/project.pbxproj
index f2e2d779..ac32beab 100644
--- a/Examples/HeroExamples.xcodeproj/project.pbxproj
+++ b/Examples/HeroExamples.xcodeproj/project.pbxproj
@@ -14,7 +14,6 @@
 		A306D3B91E1C7A2E00B6C23A /* Hero.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A306D3B21E1C7A2E00B6C23A /* Hero.framework */; };
 		A306D3BB1E1C7A2E00B6C23A /* Hero.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A306D3B21E1C7A2E00B6C23A /* Hero.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		A306D3F61E1D7A1A00B6C23A /* LiveInjection2ViewControllers.swift in Sources */ = {isa = PBXBuildFile; fileRef = A306D3F51E1D7A1A00B6C23A /* LiveInjection2ViewControllers.swift */; };
-		A306D3FB1E1D7A7200B6C23A /* LiveInjection.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A306D3F91E1D7A7200B6C23A /* LiveInjection.storyboard */; };
 		A313499B1E1E2AED00EB5139 /* ImageLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = A313499A1E1E2AED00EB5139 /* ImageLibrary.swift */; };
 		A3298CDA1E304851005B06BB /* BasePreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3298CD91E304851005B06BB /* BasePreprocessor.swift */; };
 		A3298CDF1E315B96005B06BB /* LabelMorphPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3298CDD1E315B96005B06BB /* LabelMorphPlugin.swift */; };
@@ -29,16 +28,7 @@
 		A33E60C01DE7621C0065CBD8 /* CityGuideViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A33E60BB1DE7621C0065CBD8 /* CityGuideViewController.swift */; };
 		A33E60C11DE7621C0065CBD8 /* CityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A33E60BC1DE7621C0065CBD8 /* CityViewController.swift */; };
 		A3499D9F1DF2024E0049B541 /* ImageGalleryCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3499D9E1DF2024E0049B541 /* ImageGalleryCollectionViewController.swift */; };
-		A35949131E1A29800095F407 /* Basic.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A35949111E1A29800095F407 /* Basic.storyboard */; };
-		A35949161E1A2A6A0095F407 /* MusicPlayer.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A35949141E1A2A6A0095F407 /* MusicPlayer.storyboard */; };
 		A35949181E1A2BE60095F407 /* InitialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A35949171E1A2BE60095F407 /* InitialViewController.swift */; };
-		A359491B1E1A31E20095F407 /* Menu.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A35949191E1A31E20095F407 /* Menu.storyboard */; };
-		A359491E1E1A325A0095F407 /* CityGuide.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A359491C1E1A325A0095F407 /* CityGuide.storyboard */; };
-		A35949211E1A32C50095F407 /* ImageGallery.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A359491F1E1A32C50095F407 /* ImageGallery.storyboard */; };
-		A35949241E1A36D00095F407 /* ImageViewer.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A35949221E1A36D00095F407 /* ImageViewer.storyboard */; };
-		A35949271E1A384E0095F407 /* ListToGrid.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A35949251E1A384E0095F407 /* ListToGrid.storyboard */; };
-		A359492A1E1A39B30095F407 /* Debug.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A35949281E1A39B30095F407 /* Debug.storyboard */; };
-		A359492D1E1A39D00095F407 /* LabelMorph.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A359492B1E1A39D00095F407 /* LabelMorph.storyboard */; };
 		A37D7B411E2C0C7E00AC1959 /* CascadePreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = A37D7B3D1E2C0C7E00AC1959 /* CascadePreprocessor.swift */; };
 		A37D7B421E2C0C7E00AC1959 /* IgnoreSubviewModifiersPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = A37D7B3E1E2C0C7E00AC1959 /* IgnoreSubviewModifiersPreprocessor.swift */; };
 		A37D7B431E2C0C7E00AC1959 /* MatchPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = A37D7B3F1E2C0C7E00AC1959 /* MatchPreprocessor.swift */; };
@@ -62,9 +52,21 @@
 		A39400B61E1D8749005E5454 /* LiveInjection1ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A39400B51E1D8749005E5454 /* LiveInjection1ViewController.swift */; };
 		B10FDD451E00DD9800B7B66E /* DebugViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10FDD441E00DD9800B7B66E /* DebugViewController.swift */; };
 		B114B6901E412A0B0009CEDE /* AppleProductViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B114B68F1E412A0B0009CEDE /* AppleProductViewController.swift */; };
-		B114B6921E412A140009CEDE /* AppleHomePage.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B114B6911E412A140009CEDE /* AppleHomePage.storyboard */; };
 		B185A4E61DFA6E0C00C3B85D /* ListTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B185A4E51DFA6E0C00C3B85D /* ListTableViewController.swift */; };
 		B185A4E81DFA6FE200C3B85D /* GridCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B185A4E71DFA6FE200C3B85D /* GridCollectionViewController.swift */; };
+		B19F76991E46C38E002DBC58 /* AppleHomePage.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B19F76981E46C38E002DBC58 /* AppleHomePage.storyboard */; };
+		B19F769D1E46C3A2002DBC58 /* Basic.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B19F769A1E46C3A2002DBC58 /* Basic.storyboard */; };
+		B19F769E1E46C3A2002DBC58 /* Menu.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B19F769B1E46C3A2002DBC58 /* Menu.storyboard */; };
+		B19F769F1E46C3A2002DBC58 /* MusicPlayer.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B19F769C1E46C3A2002DBC58 /* MusicPlayer.storyboard */; };
+		B19F76A11E46C3C2002DBC58 /* CityGuide.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B19F76A01E46C3C2002DBC58 /* CityGuide.storyboard */; };
+		B19F76A31E46C3CB002DBC58 /* ListToGrid.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B19F76A21E46C3CB002DBC58 /* ListToGrid.storyboard */; };
+		B19F76A61E46C3D7002DBC58 /* ImageGallery.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B19F76A41E46C3D7002DBC58 /* ImageGallery.storyboard */; };
+		B19F76A71E46C3D7002DBC58 /* ImageViewer.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B19F76A51E46C3D7002DBC58 /* ImageViewer.storyboard */; };
+		B19F76A91E46C3F2002DBC58 /* LiveInjection.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B19F76A81E46C3F2002DBC58 /* LiveInjection.storyboard */; };
+		B19F76AB1E46C3FB002DBC58 /* Debug.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B19F76AA1E46C3FB002DBC58 /* Debug.storyboard */; };
+		B19F76AD1E46C406002DBC58 /* LabelMorph.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B19F76AC1E46C406002DBC58 /* LabelMorph.storyboard */; };
+		B19F76B11E46C449002DBC58 /* VideoPlayer.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B19F76AF1E46C449002DBC58 /* VideoPlayer.storyboard */; };
+		B19F76B21E46C449002DBC58 /* VideoPlayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B19F76B01E46C449002DBC58 /* VideoPlayerViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -99,7 +101,6 @@
 		A306D3B41E1C7A2E00B6C23A /* Hero.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Hero.h; sourceTree = "<group>"; };
 		A306D3B51E1C7A2E00B6C23A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A306D3F51E1D7A1A00B6C23A /* LiveInjection2ViewControllers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LiveInjection2ViewControllers.swift; path = LiveInjection/LiveInjection2ViewControllers.swift; sourceTree = "<group>"; };
-		A306D3FA1E1D7A7200B6C23A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = HeroExamples/Base.lproj/LiveInjection.storyboard; sourceTree = SOURCE_ROOT; };
 		A313499A1E1E2AED00EB5139 /* ImageLibrary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ImageLibrary.swift; path = ImageGallery/ImageLibrary.swift; sourceTree = "<group>"; };
 		A3298CD91E304851005B06BB /* BasePreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasePreprocessor.swift; sourceTree = "<group>"; };
 		A3298CDD1E315B96005B06BB /* LabelMorphPlugin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LabelMorphPlugin.swift; path = LabelMorph/LabelMorphPlugin.swift; sourceTree = "<group>"; };
@@ -116,16 +117,7 @@
 		A33E60BB1DE7621C0065CBD8 /* CityGuideViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CityGuideViewController.swift; sourceTree = "<group>"; };
 		A33E60BC1DE7621C0065CBD8 /* CityViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CityViewController.swift; sourceTree = "<group>"; };
 		A3499D9E1DF2024E0049B541 /* ImageGalleryCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ImageGalleryCollectionViewController.swift; path = ImageGallery/ImageGalleryCollectionViewController.swift; sourceTree = "<group>"; };
-		A35949121E1A29800095F407 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Basic.storyboard; sourceTree = "<group>"; };
-		A35949151E1A2A6A0095F407 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = HeroExamples/Base.lproj/MusicPlayer.storyboard; sourceTree = SOURCE_ROOT; };
 		A35949171E1A2BE60095F407 /* InitialViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InitialViewController.swift; sourceTree = "<group>"; };
-		A359491A1E1A31E20095F407 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = HeroExamples/Base.lproj/Menu.storyboard; sourceTree = SOURCE_ROOT; };
-		A359491D1E1A325A0095F407 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = HeroExamples/Base.lproj/CityGuide.storyboard; sourceTree = SOURCE_ROOT; };
-		A35949201E1A32C50095F407 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = HeroExamples/Base.lproj/ImageGallery.storyboard; sourceTree = SOURCE_ROOT; };
-		A35949231E1A36D00095F407 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/ImageViewer.storyboard; sourceTree = "<group>"; };
-		A35949261E1A384E0095F407 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = HeroExamples/Base.lproj/ListToGrid.storyboard; sourceTree = SOURCE_ROOT; };
-		A35949291E1A39B30095F407 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Debug.storyboard; sourceTree = "<group>"; };
-		A359492C1E1A39D00095F407 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LabelMorph.storyboard; sourceTree = "<group>"; };
 		A37D7B3D1E2C0C7E00AC1959 /* CascadePreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CascadePreprocessor.swift; sourceTree = "<group>"; };
 		A37D7B3E1E2C0C7E00AC1959 /* IgnoreSubviewModifiersPreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IgnoreSubviewModifiersPreprocessor.swift; sourceTree = "<group>"; };
 		A37D7B3F1E2C0C7E00AC1959 /* MatchPreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MatchPreprocessor.swift; sourceTree = "<group>"; };
@@ -149,9 +141,21 @@
 		A39400B51E1D8749005E5454 /* LiveInjection1ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LiveInjection1ViewController.swift; path = LiveInjection/LiveInjection1ViewController.swift; sourceTree = "<group>"; };
 		B10FDD441E00DD9800B7B66E /* DebugViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DebugViewController.swift; path = Debug/DebugViewController.swift; sourceTree = "<group>"; };
 		B114B68F1E412A0B0009CEDE /* AppleProductViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppleProductViewController.swift; path = AppleHomepage/AppleProductViewController.swift; sourceTree = "<group>"; };
-		B114B6911E412A140009CEDE /* AppleHomePage.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = AppleHomePage.storyboard; sourceTree = "<group>"; };
 		B185A4E51DFA6E0C00C3B85D /* ListTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ListTableViewController.swift; path = ListToGrid/ListTableViewController.swift; sourceTree = "<group>"; };
 		B185A4E71DFA6FE200C3B85D /* GridCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GridCollectionViewController.swift; path = ListToGrid/GridCollectionViewController.swift; sourceTree = "<group>"; };
+		B19F76981E46C38E002DBC58 /* AppleHomePage.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = AppleHomePage.storyboard; path = AppleHomepage/AppleHomePage.storyboard; sourceTree = "<group>"; };
+		B19F769A1E46C3A2002DBC58 /* Basic.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Basic.storyboard; sourceTree = "<group>"; };
+		B19F769B1E46C3A2002DBC58 /* Menu.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Menu.storyboard; sourceTree = "<group>"; };
+		B19F769C1E46C3A2002DBC58 /* MusicPlayer.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MusicPlayer.storyboard; sourceTree = "<group>"; };
+		B19F76A01E46C3C2002DBC58 /* CityGuide.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = CityGuide.storyboard; sourceTree = "<group>"; };
+		B19F76A21E46C3CB002DBC58 /* ListToGrid.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ListToGrid.storyboard; path = ListToGrid/ListToGrid.storyboard; sourceTree = "<group>"; };
+		B19F76A41E46C3D7002DBC58 /* ImageGallery.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ImageGallery.storyboard; path = ImageGallery/ImageGallery.storyboard; sourceTree = "<group>"; };
+		B19F76A51E46C3D7002DBC58 /* ImageViewer.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ImageViewer.storyboard; path = ImageGallery/ImageViewer.storyboard; sourceTree = "<group>"; };
+		B19F76A81E46C3F2002DBC58 /* LiveInjection.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LiveInjection.storyboard; path = LiveInjection/LiveInjection.storyboard; sourceTree = "<group>"; };
+		B19F76AA1E46C3FB002DBC58 /* Debug.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Debug.storyboard; path = Debug/Debug.storyboard; sourceTree = "<group>"; };
+		B19F76AC1E46C406002DBC58 /* LabelMorph.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LabelMorph.storyboard; path = LabelMorph/LabelMorph.storyboard; sourceTree = "<group>"; };
+		B19F76AF1E46C449002DBC58 /* VideoPlayer.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = VideoPlayer.storyboard; sourceTree = "<group>"; };
+		B19F76B01E46C449002DBC58 /* VideoPlayerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoPlayerViewController.swift; sourceTree = "<group>"; };
 		C377744CBFF1E24426E80F55 /* Pods-HeroExamples.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HeroExamples.release.xcconfig"; path = "Pods/Target Support Files/Pods-HeroExamples/Pods-HeroExamples.release.xcconfig"; sourceTree = "<group>"; };
 		EEE340F89FF0A49DD23A5A6E /* Pods_HeroExamples.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HeroExamples.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -259,7 +263,7 @@
 		A306D3FC1E1D82AB00B6C23A /* LiveInjection */ = {
 			isa = PBXGroup;
 			children = (
-				A306D3F91E1D7A7200B6C23A /* LiveInjection.storyboard */,
+				B19F76A81E46C3F2002DBC58 /* LiveInjection.storyboard */,
 				A39400B51E1D8749005E5454 /* LiveInjection1ViewController.swift */,
 				A306D3F51E1D7A1A00B6C23A /* LiveInjection2ViewControllers.swift */,
 			);
@@ -300,9 +304,10 @@
 		A33E60B71DE7621C0065CBD8 /* Examples */ = {
 			isa = PBXGroup;
 			children = (
-				A35949111E1A29800095F407 /* Basic.storyboard */,
-				A35949141E1A2A6A0095F407 /* MusicPlayer.storyboard */,
-				A35949191E1A31E20095F407 /* Menu.storyboard */,
+				B19F769A1E46C3A2002DBC58 /* Basic.storyboard */,
+				B19F769C1E46C3A2002DBC58 /* MusicPlayer.storyboard */,
+				B19F769B1E46C3A2002DBC58 /* Menu.storyboard */,
+				B19F76AE1E46C449002DBC58 /* VideoPlayer */,
 				B114B6931E412A1B0009CEDE /* AppleHomePage */,
 				A33E60B81DE7621C0065CBD8 /* CityGuide */,
 				B185A4E91DFA6FE700C3B85D /* ListToGrid */,
@@ -317,7 +322,7 @@
 		A33E60B81DE7621C0065CBD8 /* CityGuide */ = {
 			isa = PBXGroup;
 			children = (
-				A359491C1E1A325A0095F407 /* CityGuide.storyboard */,
+				B19F76A01E46C3C2002DBC58 /* CityGuide.storyboard */,
 				A33E60B91DE7621C0065CBD8 /* City.swift */,
 				A33E60BA1DE7621C0065CBD8 /* CityGuideCell.swift */,
 				A33E60BB1DE7621C0065CBD8 /* CityGuideViewController.swift */,
@@ -341,8 +346,8 @@
 		A3499D9D1DF202350049B541 /* ImageGallery */ = {
 			isa = PBXGroup;
 			children = (
-				A359491F1E1A32C50095F407 /* ImageGallery.storyboard */,
-				A35949221E1A36D00095F407 /* ImageViewer.storyboard */,
+				B19F76A41E46C3D7002DBC58 /* ImageGallery.storyboard */,
+				B19F76A51E46C3D7002DBC58 /* ImageViewer.storyboard */,
 				A3499D9E1DF2024E0049B541 /* ImageGalleryCollectionViewController.swift */,
 				A304BF831DF2717900A03345 /* ImageViewController.swift */,
 				A313499A1E1E2AED00EB5139 /* ImageLibrary.swift */,
@@ -354,7 +359,7 @@
 		B10FDD461E00DD9D00B7B66E /* Debug */ = {
 			isa = PBXGroup;
 			children = (
-				A35949281E1A39B30095F407 /* Debug.storyboard */,
+				B19F76AA1E46C3FB002DBC58 /* Debug.storyboard */,
 				B10FDD441E00DD9800B7B66E /* DebugViewController.swift */,
 			);
 			name = Debug;
@@ -363,7 +368,7 @@
 		B114B6931E412A1B0009CEDE /* AppleHomePage */ = {
 			isa = PBXGroup;
 			children = (
-				B114B6911E412A140009CEDE /* AppleHomePage.storyboard */,
+				B19F76981E46C38E002DBC58 /* AppleHomePage.storyboard */,
 				B114B68F1E412A0B0009CEDE /* AppleProductViewController.swift */,
 			);
 			name = AppleHomePage;
@@ -372,7 +377,7 @@
 		B185A4E91DFA6FE700C3B85D /* ListToGrid */ = {
 			isa = PBXGroup;
 			children = (
-				A35949251E1A384E0095F407 /* ListToGrid.storyboard */,
+				B19F76A21E46C3CB002DBC58 /* ListToGrid.storyboard */,
 				B185A4E51DFA6E0C00C3B85D /* ListTableViewController.swift */,
 				B185A4E71DFA6FE200C3B85D /* GridCollectionViewController.swift */,
 			);
@@ -382,13 +387,22 @@
 		B195F5781DFE517500B1343C /* LabelMorph */ = {
 			isa = PBXGroup;
 			children = (
-				A359492B1E1A39D00095F407 /* LabelMorph.storyboard */,
+				B19F76AC1E46C406002DBC58 /* LabelMorph.storyboard */,
 				A3298CDD1E315B96005B06BB /* LabelMorphPlugin.swift */,
 				A3298CDE1E315B96005B06BB /* LabelMorphViewController.swift */,
 			);
 			name = LabelMorph;
 			sourceTree = "<group>";
 		};
+		B19F76AE1E46C449002DBC58 /* VideoPlayer */ = {
+			isa = PBXGroup;
+			children = (
+				B19F76AF1E46C449002DBC58 /* VideoPlayer.storyboard */,
+				B19F76B01E46C449002DBC58 /* VideoPlayerViewController.swift */,
+			);
+			path = VideoPlayer;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -498,20 +512,21 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A359491B1E1A31E20095F407 /* Menu.storyboard in Resources */,
-				A35949271E1A384E0095F407 /* ListToGrid.storyboard in Resources */,
-				A35949211E1A32C50095F407 /* ImageGallery.storyboard in Resources */,
-				B114B6921E412A140009CEDE /* AppleHomePage.storyboard in Resources */,
-				A359491E1E1A325A0095F407 /* CityGuide.storyboard in Resources */,
+				B19F76A91E46C3F2002DBC58 /* LiveInjection.storyboard in Resources */,
+				B19F76A11E46C3C2002DBC58 /* CityGuide.storyboard in Resources */,
+				B19F769D1E46C3A2002DBC58 /* Basic.storyboard in Resources */,
+				B19F769E1E46C3A2002DBC58 /* Menu.storyboard in Resources */,
+				B19F76B11E46C449002DBC58 /* VideoPlayer.storyboard in Resources */,
+				B19F76AD1E46C406002DBC58 /* LabelMorph.storyboard in Resources */,
+				B19F76A61E46C3D7002DBC58 /* ImageGallery.storyboard in Resources */,
+				B19F76A31E46C3CB002DBC58 /* ListToGrid.storyboard in Resources */,
+				B19F76991E46C38E002DBC58 /* AppleHomePage.storyboard in Resources */,
+				B19F769F1E46C3A2002DBC58 /* MusicPlayer.storyboard in Resources */,
 				A33E60AF1DE761C90065CBD8 /* LaunchScreen.storyboard in Resources */,
-				A359492A1E1A39B30095F407 /* Debug.storyboard in Resources */,
+				B19F76A71E46C3D7002DBC58 /* ImageViewer.storyboard in Resources */,
 				A33E60AC1DE761C90065CBD8 /* Assets.xcassets in Resources */,
-				A35949241E1A36D00095F407 /* ImageViewer.storyboard in Resources */,
 				A33E60AA1DE761C90065CBD8 /* Main.storyboard in Resources */,
-				A306D3FB1E1D7A7200B6C23A /* LiveInjection.storyboard in Resources */,
-				A35949131E1A29800095F407 /* Basic.storyboard in Resources */,
-				A35949161E1A2A6A0095F407 /* MusicPlayer.storyboard in Resources */,
-				A359492D1E1A39D00095F407 /* LabelMorph.storyboard in Resources */,
+				B19F76AB1E46C3FB002DBC58 /* Debug.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -629,6 +644,7 @@
 				A33E60C11DE7621C0065CBD8 /* CityViewController.swift in Sources */,
 				B185A4E81DFA6FE200C3B85D /* GridCollectionViewController.swift in Sources */,
 				A304BF8A1DF647FC00A03345 /* ImageCells.swift in Sources */,
+				B19F76B21E46C449002DBC58 /* VideoPlayerViewController.swift in Sources */,
 				A3298CE01E315B96005B06BB /* LabelMorphViewController.swift in Sources */,
 				A313499B1E1E2AED00EB5139 /* ImageLibrary.swift in Sources */,
 			);
@@ -645,14 +661,6 @@
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
-		A306D3F91E1D7A7200B6C23A /* LiveInjection.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				A306D3FA1E1D7A7200B6C23A /* Base */,
-			);
-			name = LiveInjection.storyboard;
-			sourceTree = "<group>";
-		};
 		A33E60A81DE761C90065CBD8 /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -669,83 +677,6 @@
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
 		};
-		A35949111E1A29800095F407 /* Basic.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				A35949121E1A29800095F407 /* Base */,
-			);
-			name = Basic.storyboard;
-			path = ..;
-			sourceTree = "<group>";
-		};
-		A35949141E1A2A6A0095F407 /* MusicPlayer.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				A35949151E1A2A6A0095F407 /* Base */,
-			);
-			name = MusicPlayer.storyboard;
-			sourceTree = "<group>";
-		};
-		A35949191E1A31E20095F407 /* Menu.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				A359491A1E1A31E20095F407 /* Base */,
-			);
-			name = Menu.storyboard;
-			sourceTree = "<group>";
-		};
-		A359491C1E1A325A0095F407 /* CityGuide.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				A359491D1E1A325A0095F407 /* Base */,
-			);
-			name = CityGuide.storyboard;
-			path = ..;
-			sourceTree = "<group>";
-		};
-		A359491F1E1A32C50095F407 /* ImageGallery.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				A35949201E1A32C50095F407 /* Base */,
-			);
-			name = ImageGallery.storyboard;
-			sourceTree = "<group>";
-		};
-		A35949221E1A36D00095F407 /* ImageViewer.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				A35949231E1A36D00095F407 /* Base */,
-			);
-			name = ImageViewer.storyboard;
-			path = ..;
-			sourceTree = "<group>";
-		};
-		A35949251E1A384E0095F407 /* ListToGrid.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				A35949261E1A384E0095F407 /* Base */,
-			);
-			name = ListToGrid.storyboard;
-			sourceTree = "<group>";
-		};
-		A35949281E1A39B30095F407 /* Debug.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				A35949291E1A39B30095F407 /* Base */,
-			);
-			name = Debug.storyboard;
-			path = ..;
-			sourceTree = "<group>";
-		};
-		A359492B1E1A39D00095F407 /* LabelMorph.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				A359492C1E1A39D00095F407 /* Base */,
-			);
-			name = LabelMorph.storyboard;
-			path = ..;
-			sourceTree = "<group>";
-		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
diff --git a/Examples/HeroExamples/Assets.xcassets/bigbuckbunny.imageset/Contents.json b/Examples/HeroExamples/Assets.xcassets/bigbuckbunny.imageset/Contents.json
new file mode 100644
index 00000000..4acb4bb9
--- /dev/null
+++ b/Examples/HeroExamples/Assets.xcassets/bigbuckbunny.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "poster.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Examples/HeroExamples/Assets.xcassets/bigbuckbunny.imageset/poster.jpg b/Examples/HeroExamples/Assets.xcassets/bigbuckbunny.imageset/poster.jpg
new file mode 100644
index 00000000..cd11fd66
Binary files /dev/null and b/Examples/HeroExamples/Assets.xcassets/bigbuckbunny.imageset/poster.jpg differ
diff --git a/Examples/HeroExamples/Base.lproj/AppleHomePage.storyboard b/Examples/HeroExamples/Base.lproj/AppleHomePage.storyboard
deleted file mode 100644
index 61a548bf..00000000
--- a/Examples/HeroExamples/Base.lproj/AppleHomePage.storyboard
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C68" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="hC7-Hw-3Wq">
-    <device id="retina5_5" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--watch-->
-        <scene sceneID="jmL-yE-aNc">
-            <objects>
-                <viewController storyboardIdentifier="watch" title="watch" id="Jyp-vf-9Ct" customClass="ViewController" customModule="AppleProductShowcaseExample" customModuleProvider="target" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="mYe-gF-Jys"/>
-                        <viewControllerLayoutGuide type="bottom" id="tVE-Ib-ePK"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="3rH-d1-jFG">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="watch_alt_portrait_small_2x" translatesAutoresizingMaskIntoConstraints="NO" id="GWN-Ta-qe3">
-                                <rect key="frame" x="37" y="108" width="340" height="480"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="480" id="2Dp-ze-mFU"/>
-                                    <constraint firstAttribute="width" constant="340" id="53f-MT-RUa"/>
-                                </constraints>
-                            </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qlp-Ss-wVH">
-                                <rect key="frame" x="151" y="163" width="112" height="41"/>
-                                <attributedString key="attributedText">
-                                    <fragment content="">
-                                        <attributes>
-                                            <color key="NSColor" red="0.13797999999999999" green="0.12134" blue="0.12545000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <font key="NSFont" size="24" name="LucidaGrande"/>
-                                            <real key="NSKern" value="0.0"/>
-                                            <font key="NSOriginalFont" size="24" name="LucidaGrande"/>
-                                            <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="leftToRight" defaultTabInterval="36" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
-                                            <color key="NSStrokeColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        </attributes>
-                                    </fragment>
-                                    <fragment content=" ">
-                                        <attributes>
-                                            <color key="NSColor" red="0.13797999999999999" green="0.12134" blue="0.12545000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <font key="NSFont" size="24" name="OpenSans"/>
-                                            <real key="NSKern" value="0.0"/>
-                                            <font key="NSOriginalFont" size="24" name="OpenSans"/>
-                                            <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="leftToRight" defaultTabInterval="36" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
-                                            <color key="NSStrokeColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        </attributes>
-                                    </fragment>
-                                    <fragment content="WATCH">
-                                        <attributes>
-                                            <color key="NSColor" red="0.13797999999999999" green="0.12134" blue="0.12545000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <font key="NSFont" size="24" name="OpenSans-Bold"/>
-                                            <real key="NSKern" value="0.0"/>
-                                            <font key="NSOriginalFont" size="22" name="SFUIDisplay-Bold"/>
-                                            <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="leftToRight" defaultTabInterval="36" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
-                                            <color key="NSStrokeColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        </attributes>
-                                    </fragment>
-                                    <fragment>
-                                        <string key="content">
-SERIES 2</string>
-                                        <attributes>
-                                            <color key="NSColor" red="0.13797999999999999" green="0.12134" blue="0.12545000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <font key="NSFont" size="11" name="OpenSans"/>
-                                            <real key="NSKern" value="0.0"/>
-                                            <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="leftToRight" defaultTabInterval="36" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
-                                            <color key="NSStrokeColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        </attributes>
-                                    </fragment>
-                                </attributedString>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Introducing Series 2." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mXx-VP-ibg">
-                                <rect key="frame" x="75.666666666666686" y="521" width="263" height="34"/>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="28"/>
-                                <color key="textColor" red="0.13798230889999999" green="0.121344544" blue="0.12544536589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yqa-hy-WtD">
-                                <rect key="frame" x="207" y="208" width="0.0" height="0.0"/>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
-                                <color key="textColor" red="0.13798230889999999" green="0.121344544" blue="0.12544536589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <color key="backgroundColor" red="0.94893652200698853" green="0.94907277822494507" blue="0.94890683889389038" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstItem="mXx-VP-ibg" firstAttribute="centerX" secondItem="3rH-d1-jFG" secondAttribute="centerX" id="0aT-RI-l1A"/>
-                            <constraint firstItem="Qlp-Ss-wVH" firstAttribute="centerX" secondItem="3rH-d1-jFG" secondAttribute="centerX" id="M7L-Ah-dLs"/>
-                            <constraint firstItem="GWN-Ta-qe3" firstAttribute="centerX" secondItem="3rH-d1-jFG" secondAttribute="centerX" id="NhD-Hd-Bey"/>
-                            <constraint firstItem="yqa-hy-WtD" firstAttribute="top" secondItem="Qlp-Ss-wVH" secondAttribute="bottom" constant="4" id="S5e-g8-Wa3"/>
-                            <constraint firstItem="yqa-hy-WtD" firstAttribute="centerX" secondItem="3rH-d1-jFG" secondAttribute="centerX" id="Yjs-rv-3bW"/>
-                            <constraint firstItem="yqa-hy-WtD" firstAttribute="centerY" secondItem="3rH-d1-jFG" secondAttribute="centerY" constant="-160" id="bg5-Wp-Z1o"/>
-                            <constraint firstItem="GWN-Ta-qe3" firstAttribute="centerY" secondItem="3rH-d1-jFG" secondAttribute="centerY" constant="-20" id="cMC-yq-AMj"/>
-                            <constraint firstItem="mXx-VP-ibg" firstAttribute="centerY" secondItem="3rH-d1-jFG" secondAttribute="centerY" constant="170" id="fJG-sg-VC9"/>
-                        </constraints>
-                    </view>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="isHeroEnabled" value="YES"/>
-                    </userDefinedRuntimeAttributes>
-                    <connections>
-                        <outlet property="imageView" destination="GWN-Ta-qe3" id="FrJ-hV-Bby"/>
-                        <outlet property="primaryLabel" destination="Qlp-Ss-wVH" id="VEq-Kl-4Ev"/>
-                        <outlet property="secondaryLabel" destination="mXx-VP-ibg" id="v2T-6b-iju"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="RcI-CE-08V" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-384.375" y="660"/>
-        </scene>
-        <!--macbook-->
-        <scene sceneID="pet-zU-fdg">
-            <objects>
-                <viewController storyboardIdentifier="macbook" title="macbook" id="xzU-1j-BE3" customClass="ViewController" customModule="AppleProductShowcaseExample" customModuleProvider="target" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="1aZ-3s-ozY"/>
-                        <viewControllerLayoutGuide type="bottom" id="lgE-5R-GGQ"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="Xbl-Rm-Pl2">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="macbookpro_portrait_small_2x" translatesAutoresizingMaskIntoConstraints="NO" id="bUd-Q3-tAU">
-                                <rect key="frame" x="0.0" y="280" width="414" height="481"/>
-                            </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A touch of genius." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NJl-s5-uPY">
-                                <rect key="frame" x="91.666666666666686" y="181" width="231" height="34"/>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="28"/>
-                                <color key="textColor" red="0.13798230889999999" green="0.121344544" blue="0.12544536589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MacBook Pro" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eDw-4Q-WTZ">
-                                <rect key="frame" x="140" y="154" width="134" height="27"/>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="22"/>
-                                <color key="textColor" red="0.13798230889999999" green="0.121344544" blue="0.12544536589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="bUd-Q3-tAU" firstAttribute="leading" secondItem="Xbl-Rm-Pl2" secondAttribute="leading" id="Bcg-Cm-fmg"/>
-                            <constraint firstAttribute="bottom" secondItem="bUd-Q3-tAU" secondAttribute="bottom" constant="-25" id="E0q-k1-b6O"/>
-                            <constraint firstItem="bUd-Q3-tAU" firstAttribute="top" secondItem="NJl-s5-uPY" secondAttribute="bottom" constant="65" id="Jfm-rQ-RuO"/>
-                            <constraint firstAttribute="trailing" secondItem="bUd-Q3-tAU" secondAttribute="trailing" id="NUu-GF-lTt"/>
-                            <constraint firstItem="NJl-s5-uPY" firstAttribute="top" secondItem="eDw-4Q-WTZ" secondAttribute="bottom" id="eTr-EI-88B"/>
-                            <constraint firstItem="eDw-4Q-WTZ" firstAttribute="centerX" secondItem="Xbl-Rm-Pl2" secondAttribute="centerX" id="jmY-x8-eRi"/>
-                            <constraint firstItem="NJl-s5-uPY" firstAttribute="centerX" secondItem="Xbl-Rm-Pl2" secondAttribute="centerX" id="ju4-dQ-xui"/>
-                            <constraint firstItem="NJl-s5-uPY" firstAttribute="centerY" secondItem="Xbl-Rm-Pl2" secondAttribute="centerY" constant="-170" id="qBG-u9-pIL"/>
-                        </constraints>
-                    </view>
-                    <tabBarItem key="tabBarItem" title="Item" id="gsN-ng-YVs"/>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="isHeroEnabled" value="YES"/>
-                    </userDefinedRuntimeAttributes>
-                    <connections>
-                        <outlet property="imageView" destination="bUd-Q3-tAU" id="Wbi-yC-9j1"/>
-                        <outlet property="primaryLabel" destination="eDw-4Q-WTZ" id="v2D-Bf-pC7"/>
-                        <outlet property="secondaryLabel" destination="NJl-s5-uPY" id="8da-fD-I3W"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="DOw-gI-E85" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="300" y="660"/>
-        </scene>
-        <!--iphone-->
-        <scene sceneID="YEA-Qk-pRX">
-            <objects>
-                <viewController storyboardIdentifier="iphone" title="iphone" id="hC7-Hw-3Wq" customClass="ViewController" customModule="AppleProductShowcaseExample" customModuleProvider="target" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="9im-Ps-71S"/>
-                        <viewControllerLayoutGuide type="bottom" id="jCX-1p-gzL"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="i99-pY-s2B">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="iphone_alt_small_2x" translatesAutoresizingMaskIntoConstraints="NO" id="JPb-Q2-CkP">
-                                <rect key="frame" x="0.0" y="128" width="414" height="480"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="480" id="SAq-kp-ydw"/>
-                                </constraints>
-                            </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="iPhone" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X8U-ip-pdE">
-                                <rect key="frame" x="171.66666666666666" y="153" width="71" height="26.666666666666657"/>
-                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="22"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This is 7." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UPq-F1-1sn">
-                                <rect key="frame" x="145.66666666666669" y="179.66666666666666" width="123.00000000000006" height="37"/>
-                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="31"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <color key="backgroundColor" red="0.039207898080348969" green="0.039220668375492096" blue="0.039205107837915421" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstItem="X8U-ip-pdE" firstAttribute="centerX" secondItem="i99-pY-s2B" secondAttribute="centerX" id="5hu-CP-5h6"/>
-                            <constraint firstItem="JPb-Q2-CkP" firstAttribute="centerY" secondItem="i99-pY-s2B" secondAttribute="centerY" id="BZx-Zb-dWd"/>
-                            <constraint firstItem="UPq-F1-1sn" firstAttribute="centerX" secondItem="i99-pY-s2B" secondAttribute="centerX" id="VGV-7o-cNM"/>
-                            <constraint firstAttribute="trailing" secondItem="JPb-Q2-CkP" secondAttribute="trailing" id="k9N-7T-GoQ"/>
-                            <constraint firstItem="UPq-F1-1sn" firstAttribute="centerY" secondItem="i99-pY-s2B" secondAttribute="centerY" constant="-170" id="mQy-xi-ag1"/>
-                            <constraint firstItem="UPq-F1-1sn" firstAttribute="top" secondItem="X8U-ip-pdE" secondAttribute="bottom" id="ozS-Bw-VCH"/>
-                            <constraint firstItem="JPb-Q2-CkP" firstAttribute="leading" secondItem="i99-pY-s2B" secondAttribute="leading" id="piN-FW-0NW"/>
-                        </constraints>
-                    </view>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="isHeroEnabled" value="YES"/>
-                    </userDefinedRuntimeAttributes>
-                    <connections>
-                        <outlet property="imageView" destination="JPb-Q2-CkP" id="VcD-8J-PFC"/>
-                        <outlet property="primaryLabel" destination="X8U-ip-pdE" id="bZu-Wr-MVQ"/>
-                        <outlet property="secondaryLabel" destination="UPq-F1-1sn" id="j9X-gs-3v5"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="jVP-SB-1G7" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-1067" y="660"/>
-        </scene>
-    </scenes>
-    <resources>
-        <image name="iphone_alt_small_2x" width="2254" height="1408"/>
-        <image name="macbookpro_portrait_small_2x" width="2214" height="896"/>
-        <image name="watch_alt_portrait_small_2x" width="950" height="1448"/>
-    </resources>
-</document>
diff --git a/Examples/HeroExamples/Base.lproj/Main.storyboard b/Examples/HeroExamples/Base.lproj/Main.storyboard
index 7c10a8d1..935ca693 100644
--- a/Examples/HeroExamples/Base.lproj/Main.storyboard
+++ b/Examples/HeroExamples/Base.lproj/Main.storyboard
@@ -24,7 +24,7 @@
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="476"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pZE-ev-rsi" id="Nkg-85-ubg">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="475.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="475"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HeroLogo" translatesAutoresizingMaskIntoConstraints="NO" id="dy3-SR-wdB">
@@ -51,7 +51,7 @@
                                         <rect key="frame" x="0.0" y="504" width="375" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qLM-vu-Nnu" id="PSr-Dz-vh5">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Basic" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rcH-9o-cCi">
@@ -149,7 +149,7 @@
                                         <rect key="frame" x="0.0" y="584" width="375" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gb0-H4-9us" id="4UC-Sz-MFk">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="album1" translatesAutoresizingMaskIntoConstraints="NO" id="HfF-K3-i3E">
@@ -226,7 +226,7 @@
                                         <rect key="frame" x="0.0" y="664" width="375" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="aKS-jR-jiU" id="p35-42-be9">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="ic_menu_48pt" translatesAutoresizingMaskIntoConstraints="NO" id="vER-GQ-PVr">
@@ -284,7 +284,7 @@
                                         <rect key="frame" x="0.0" y="772" width="375" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rcm-aO-p18" id="1lj-X7-q7D">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="cityGuide" translatesAutoresizingMaskIntoConstraints="NO" id="F2l-sp-8cf">
@@ -334,7 +334,7 @@
                                         <rect key="frame" x="0.0" y="852" width="375" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="CgN-8n-fJN" id="zq6-6B-vWg">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="Unsplash0_thumb" translatesAutoresizingMaskIntoConstraints="NO" id="K7I-oT-r4m">
@@ -379,11 +379,54 @@
                                         </tableViewCellContentView>
                                         <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="80" id="OSi-gT-m2z">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="80" id="WgK-jC-Cda">
                                         <rect key="frame" x="0.0" y="932" width="375" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WgK-jC-Cda" id="D92-18-M7B">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="bigbuckbunny" translatesAutoresizingMaskIntoConstraints="NO" id="9ig-RF-Dp3">
+                                                    <rect key="frame" x="0.0" y="0.0" width="80" height="79.5"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <color key="backgroundColor" red="0.94117647059999998" green="0.35294117650000001" blue="0.32549019610000002" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="tintColor" red="0.25490196079999999" green="0.28627450980000002" blue="0.30980392159999998" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <userDefinedRuntimeAttributes>
+                                                        <userDefinedRuntimeAttribute type="string" keyPath="heroID" value="videoPlayer"/>
+                                                    </userDefinedRuntimeAttributes>
+                                                </imageView>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Video Player" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jix-sm-0xu">
+                                                    <rect key="frame" x="96" y="16" width="113" height="24"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uyP-hE-Biy">
+                                                    <rect key="frame" x="96" y="40" width="271" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <attributedString key="attributedText">
+                                                        <fragment content="direct transfer view">
+                                                            <attributes>
+                                                                <color key="NSColor" red="0.32257999999999998" green="0.35811999999999999" blue="0.38322000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                <font key="NSFont" size="17" name="HelveticaNeue-Bold"/>
+                                                                <real key="NSKern" value="0.0"/>
+                                                                <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="leftToRight" defaultTabInterval="36" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+                                                                <color key="NSStrokeColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            </attributes>
+                                                        </fragment>
+                                                    </attributedString>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                        <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="80" id="OSi-gT-m2z">
+                                        <rect key="frame" x="0.0" y="1012" width="375" height="80"/>
+                                        <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OSi-gT-m2z" id="eul-1H-gY0">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="iphone_alt_small_2x" translatesAutoresizingMaskIntoConstraints="NO" id="1g3-ZG-SVg">
@@ -432,10 +475,10 @@
                                         <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="80" id="gkr-de-vuU">
-                                        <rect key="frame" x="0.0" y="1012" width="375" height="80"/>
+                                        <rect key="frame" x="0.0" y="1092" width="375" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gkr-de-vuU" id="gS7-xf-BVj">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="Unsplash2_thumb" translatesAutoresizingMaskIntoConstraints="NO" id="nGu-4Z-hF9">
@@ -481,10 +524,10 @@
                                         <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="80" id="9qD-dD-oiJ">
-                                        <rect key="frame" x="0.0" y="1092" width="375" height="80"/>
+                                        <rect key="frame" x="0.0" y="1172" width="375" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9qD-dD-oiJ" id="4uW-DX-Nhe">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="Unsplash4_thumb" translatesAutoresizingMaskIntoConstraints="NO" id="aYp-EL-mpf">
@@ -534,10 +577,10 @@
                             <tableViewSection headerTitle="Advance" id="B0B-Vb-g0L">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="80" id="C9Z-1e-EB1">
-                                        <rect key="frame" x="0.0" y="1200" width="375" height="80"/>
+                                        <rect key="frame" x="0.0" y="1280" width="375" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="C9Z-1e-EB1" id="WqL-Bn-cgH">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="ic_input_48pt" translatesAutoresizingMaskIntoConstraints="NO" id="WmJ-dz-xMS">
@@ -581,10 +624,10 @@
                                         <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="80" id="Byf-ZA-Jmq">
-                                        <rect key="frame" x="0.0" y="1280" width="375" height="80"/>
+                                        <rect key="frame" x="0.0" y="1360" width="375" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Byf-ZA-Jmq" id="eB6-rn-mDt">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="ic_bug_report_48pt" translatesAutoresizingMaskIntoConstraints="NO" id="ify-4K-Akf">
@@ -646,10 +689,10 @@
                                         <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="80" id="wWy-ke-JUA">
-                                        <rect key="frame" x="0.0" y="1360" width="375" height="80"/>
+                                        <rect key="frame" x="0.0" y="1440" width="375" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wWy-ke-JUA" id="4HF-xC-8eF">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="79"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="ic_text_fields_48pt" translatesAutoresizingMaskIntoConstraints="NO" id="wDj-yB-iqg">
@@ -714,6 +757,7 @@
         <image name="Unsplash2_thumb" width="512" height="512"/>
         <image name="Unsplash4_thumb" width="512" height="512"/>
         <image name="album1" width="1024" height="1024"/>
+        <image name="bigbuckbunny" width="640" height="360"/>
         <image name="cityGuide" width="240" height="240"/>
         <image name="ic_bug_report_48pt" width="48" height="48"/>
         <image name="ic_input_48pt" width="48" height="48"/>
diff --git a/Examples/HeroExamples/Examples/AppleHomePage.storyboard b/Examples/HeroExamples/Examples/AppleHomepage/AppleHomePage.storyboard
similarity index 100%
rename from Examples/HeroExamples/Examples/AppleHomePage.storyboard
rename to Examples/HeroExamples/Examples/AppleHomepage/AppleHomePage.storyboard
diff --git a/Examples/HeroExamples/Base.lproj/Basic.storyboard b/Examples/HeroExamples/Examples/Basic.storyboard
similarity index 99%
rename from Examples/HeroExamples/Base.lproj/Basic.storyboard
rename to Examples/HeroExamples/Examples/Basic.storyboard
index 253d13f3..238570c6 100644
--- a/Examples/HeroExamples/Base.lproj/Basic.storyboard
+++ b/Examples/HeroExamples/Examples/Basic.storyboard
@@ -131,7 +131,7 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="heroID" value="back"/>
                                 </userDefinedRuntimeAttributes>
                                 <connections>
-                                    <action selector="hero_unwindToRootViewController:" destination="zcb-C5-i3s" eventType="touchUpInside" id="hOy-ho-D9j"/>
+                                    <action selector="hero_unwindToRootViewController" destination="zcb-C5-i3s" eventType="touchUpInside" id="xDF-5K-otU"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yH9-LF-tZp">
@@ -291,7 +291,7 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="heroID" value="back"/>
                                 </userDefinedRuntimeAttributes>
                                 <connections>
-                                    <action selector="hero_unwindToRootViewController:" destination="wDI-eb-elr" eventType="touchUpInside" id="Z9U-bp-yNX"/>
+                                    <action selector="hero_unwindToRootViewController" destination="wDI-eb-elr" eventType="touchUpInside" id="5wS-Y1-0nx"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Q39-Fs-YPd">
diff --git a/Examples/HeroExamples/Base.lproj/CityGuide.storyboard b/Examples/HeroExamples/Examples/CityGuide/CityGuide.storyboard
similarity index 100%
rename from Examples/HeroExamples/Base.lproj/CityGuide.storyboard
rename to Examples/HeroExamples/Examples/CityGuide/CityGuide.storyboard
diff --git a/Examples/HeroExamples/Base.lproj/Debug.storyboard b/Examples/HeroExamples/Examples/Debug/Debug.storyboard
similarity index 100%
rename from Examples/HeroExamples/Base.lproj/Debug.storyboard
rename to Examples/HeroExamples/Examples/Debug/Debug.storyboard
diff --git a/Examples/HeroExamples/Base.lproj/ImageGallery.storyboard b/Examples/HeroExamples/Examples/ImageGallery/ImageGallery.storyboard
similarity index 100%
rename from Examples/HeroExamples/Base.lproj/ImageGallery.storyboard
rename to Examples/HeroExamples/Examples/ImageGallery/ImageGallery.storyboard
diff --git a/Examples/HeroExamples/Examples/ImageGallery/ImageViewController.swift b/Examples/HeroExamples/Examples/ImageGallery/ImageViewController.swift
index 8d6cb12a..bc0b3312 100644
--- a/Examples/HeroExamples/Examples/ImageGallery/ImageViewController.swift
+++ b/Examples/HeroExamples/Examples/ImageGallery/ImageViewController.swift
@@ -63,7 +63,7 @@ class ImageViewController: UICollectionViewController {
         Hero.shared.apply(modifiers: [.position(currentPos)], to: cell.imageView)
       }
     default:
-      if progress + panGR.velocity(in: nil).y / collectionView!.bounds.height > 0.15 {
+      if progress + panGR.velocity(in: nil).y / collectionView!.bounds.height > 0.3 {
         Hero.shared.end()
       } else {
         Hero.shared.cancel()
@@ -81,7 +81,7 @@ extension ImageViewController {
     let imageCell = (collectionView.dequeueReusableCell(withReuseIdentifier: "item", for: indexPath) as? ScrollingImageCell)!
     imageCell.image = ImageLibrary.image(index:indexPath.item)
     imageCell.imageView.heroID = "image_\(indexPath.item)"
-    imageCell.imageView.heroModifiers = [.position(CGPoint(x:view.bounds.width/2, y:view.bounds.height+view.bounds.width/2)), .scale(x:0.6, y:0.6), .fade, .zPositionIfMatched(100)]
+    imageCell.imageView.heroModifiers = [.position(CGPoint(x:view.bounds.width/2, y:view.bounds.height+view.bounds.width/2)), .scale(0.6), .fade, .zPositionIfMatched(100)]
     imageCell.topInset = topLayoutGuide.length
     return imageCell
   }
diff --git a/Examples/HeroExamples/Base.lproj/ImageViewer.storyboard b/Examples/HeroExamples/Examples/ImageGallery/ImageViewer.storyboard
similarity index 100%
rename from Examples/HeroExamples/Base.lproj/ImageViewer.storyboard
rename to Examples/HeroExamples/Examples/ImageGallery/ImageViewer.storyboard
diff --git a/Examples/HeroExamples/Base.lproj/LabelMorph.storyboard b/Examples/HeroExamples/Examples/LabelMorph/LabelMorph.storyboard
similarity index 100%
rename from Examples/HeroExamples/Base.lproj/LabelMorph.storyboard
rename to Examples/HeroExamples/Examples/LabelMorph/LabelMorph.storyboard
diff --git a/Examples/HeroExamples/Base.lproj/ListToGrid.storyboard b/Examples/HeroExamples/Examples/ListToGrid/ListToGrid.storyboard
similarity index 100%
rename from Examples/HeroExamples/Base.lproj/ListToGrid.storyboard
rename to Examples/HeroExamples/Examples/ListToGrid/ListToGrid.storyboard
diff --git a/Examples/HeroExamples/Base.lproj/LiveInjection.storyboard b/Examples/HeroExamples/Examples/LiveInjection/LiveInjection.storyboard
similarity index 100%
rename from Examples/HeroExamples/Base.lproj/LiveInjection.storyboard
rename to Examples/HeroExamples/Examples/LiveInjection/LiveInjection.storyboard
diff --git a/Examples/HeroExamples/Base.lproj/Menu.storyboard b/Examples/HeroExamples/Examples/Menu.storyboard
similarity index 100%
rename from Examples/HeroExamples/Base.lproj/Menu.storyboard
rename to Examples/HeroExamples/Examples/Menu.storyboard
diff --git a/Examples/HeroExamples/Base.lproj/MusicPlayer.storyboard b/Examples/HeroExamples/Examples/MusicPlayer.storyboard
similarity index 99%
rename from Examples/HeroExamples/Base.lproj/MusicPlayer.storyboard
rename to Examples/HeroExamples/Examples/MusicPlayer.storyboard
index 301e5675..f254e3a5 100644
--- a/Examples/HeroExamples/Base.lproj/MusicPlayer.storyboard
+++ b/Examples/HeroExamples/Examples/MusicPlayer.storyboard
@@ -128,7 +128,7 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="heroID" value="back"/>
                                 </userDefinedRuntimeAttributes>
                                 <connections>
-                                    <action selector="hero_unwindToRootViewController:" destination="Mgk-EP-GQc" eventType="touchUpInside" id="fHe-iQ-NX2"/>
+                                    <action selector="hero_unwindToRootViewController" destination="Mgk-EP-GQc" eventType="touchUpInside" id="5VM-Fk-Xjc"/>
                                 </connections>
                             </button>
                         </subviews>
@@ -294,7 +294,7 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="heroID" value="back"/>
                                 </userDefinedRuntimeAttributes>
                                 <connections>
-                                    <action selector="hero_unwindToRootViewController:" destination="cry-03-6sb" eventType="touchUpInside" id="mOk-Io-4SU"/>
+                                    <action selector="hero_unwindToRootViewController" destination="cry-03-6sb" eventType="touchUpInside" id="k7w-R6-k4b"/>
                                 </connections>
                             </button>
                         </subviews>
diff --git a/Examples/HeroExamples/Examples/VideoPlayer/VideoPlayer.storyboard b/Examples/HeroExamples/Examples/VideoPlayer/VideoPlayer.storyboard
new file mode 100644
index 00000000..f1f335f6
--- /dev/null
+++ b/Examples/HeroExamples/Examples/VideoPlayer/VideoPlayer.storyboard
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C68" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Jlr-UW-RBl">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Video Player View Controller-->
+        <scene sceneID="1nH-rV-HNC">
+            <objects>
+                <viewController id="Jlr-UW-RBl" customClass="VideoPlayerViewController" customModule="HeroExamples" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="hf8-Fp-Md5"/>
+                        <viewControllerLayoutGuide type="bottom" id="GrU-da-mkb"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="sJC-Pq-CA9">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="z6Y-4L-zqp">
+                                <rect key="frame" x="8" y="28" width="48" height="48"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="48" id="9CC-aa-S8X"/>
+                                    <constraint firstAttribute="width" constant="48" id="Ny5-Ce-hwc"/>
+                                </constraints>
+                                <color key="tintColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                <state key="normal" image="ic_keyboard_arrow_down"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                        <real key="value" value="24"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="heroModifierString" value="fade translate(0, -150)"/>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="heroID" value="back"/>
+                                </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <action selector="hero_dismissViewController" destination="wAT-Zx-dlV" eventType="touchUpInside" id="eY3-Hc-QXA"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="z6Y-4L-zqp" firstAttribute="top" secondItem="hf8-Fp-Md5" secondAttribute="bottom" constant="8" id="3iS-CQ-7V0"/>
+                            <constraint firstItem="z6Y-4L-zqp" firstAttribute="leading" secondItem="sJC-Pq-CA9" secondAttribute="leading" constant="8" id="x8a-3B-voa"/>
+                        </constraints>
+                    </view>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="isHeroEnabled" value="YES"/>
+                    </userDefinedRuntimeAttributes>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="wAT-Zx-dlV" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="20" y="-145.27736131934034"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="ic_keyboard_arrow_down" width="24" height="24"/>
+    </resources>
+</document>
diff --git a/Examples/HeroExamples/Examples/VideoPlayer/VideoPlayerViewController.swift b/Examples/HeroExamples/Examples/VideoPlayer/VideoPlayerViewController.swift
new file mode 100644
index 00000000..5ae683b2
--- /dev/null
+++ b/Examples/HeroExamples/Examples/VideoPlayer/VideoPlayerViewController.swift
@@ -0,0 +1,88 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2016 Luke Zhao <me@lkzhao.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import UIKit
+import Hero
+import AVKit
+import AVFoundation
+
+class AVPlayerView: UIView {
+  override class var layerClass: Swift.AnyClass {
+    return AVPlayerLayer.self
+  }
+}
+
+class VideoPlayerViewController: UIViewController {
+  var playerView: UIView!
+  var panGR: UIPanGestureRecognizer!
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+    let player = AVPlayer(url: URL(string: "https://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4")!)
+
+    playerView = AVPlayerView(frame: view.bounds)
+    (playerView.layer as! AVPlayerLayer).player = player
+    playerView.heroID = "videoPlayer"
+    playerView.heroModifiers = [.useNoSnapshot, .useScaleBasedSizeChange]
+    view.insertSubview(playerView, at: 0)
+
+    panGR = UIPanGestureRecognizer(target: self, action: #selector(pan))
+    view.addGestureRecognizer(panGR)
+
+    // skip the initial splash screen of the video
+    player.seek(to: CMTimeMakeWithSeconds(0.35, 1000), toleranceBefore: kCMTimeZero, toleranceAfter: kCMTimeZero)
+    player.play()
+  }
+
+  func pan() {
+    let translation = panGR.translation(in: nil)
+    let progress = translation.y / 2 / view.bounds.height
+    switch panGR.state {
+    case .began:
+      hero_dismissViewController()
+    case .changed:
+      Hero.shared.update(progress: Double(progress))
+      let currentPos = CGPoint(x: translation.x + view.center.x, y: translation.y + view.center.y)
+      Hero.shared.apply(modifiers: [.position(currentPos)], to: playerView)
+    default:
+      if progress + panGR.velocity(in: nil).y / view.bounds.height > 0.3 {
+        Hero.shared.end()
+      } else {
+        Hero.shared.cancel()
+      }
+    }
+  }
+
+  override func viewWillLayoutSubviews() {
+    super.viewWillLayoutSubviews()
+    playerView.frame = CGRect(x: 0, y: 0, width: view.bounds.width, height: view.bounds.width / 16 * 9)
+    playerView.center = view.center
+  }
+
+  override func viewDidAppear(_ animated: Bool) {
+    super.viewDidAppear(animated)
+    // must re-insert the playerView since we used .useNoSnapshot modifier on it.
+    // Hero will take it out of the view hierarchy during the transition.
+    playerView.frame = view.bounds
+    view.insertSubview(playerView, at: 0)
+  }
+}
diff --git a/Examples/HeroExamples/InitialViewController.swift b/Examples/HeroExamples/InitialViewController.swift
index 28050758..4b1cc642 100644
--- a/Examples/HeroExamples/InitialViewController.swift
+++ b/Examples/HeroExamples/InitialViewController.swift
@@ -12,8 +12,8 @@ class InitialViewController: UITableViewController {
 
   var storyboards: [[String]] = [
     [],
-    ["Basic", "MusicPlayer", "Menu"],
-    ["CityGuide", "ImageViewer", "AppleHomePage", "ListToGrid", "ImageGallery"],
+    ["Basic", "MusicPlayer", "Menu", "VideoPlayer"],
+    ["CityGuide", "ImageViewer", "VideoPlayer", "AppleHomePage", "ListToGrid", "ImageGallery"],
     ["LiveInjection", "Debug", "LabelMorph"]
   ]
 
@@ -24,24 +24,4 @@ class InitialViewController: UITableViewController {
       present(vc, animated: true, completion: nil)
     }
   }
-  
-  override func viewWillAppear(_ animated: Bool) {
-    print("viewWillAppear")
-    super.viewWillAppear(animated)
-  }
-  
-  override func viewDidAppear(_ animated: Bool) {
-    print("viewDidAppear")
-    super.viewDidAppear(animated)
-  }
-  
-  override func viewWillDisappear(_ animated: Bool) {
-    print("viewWillDisappear")
-    super.viewWillDisappear(animated)
-  }
-  
-  override func viewDidDisappear(_ animated: Bool) {
-    print("viewDidDisappear")
-    super.viewDidDisappear(animated)
-  }
 }
diff --git a/Sources/Hero.swift b/Sources/Hero.swift
index 8721fbd0..01489cb3 100644
--- a/Sources/Hero.swift
+++ b/Sources/Hero.swift
@@ -415,7 +415,7 @@ internal extension Hero {
     let tContext = transitionContext
     let completion = completionCallback
     let fvc = fromViewController
-    let tvc = fromViewController
+    let tvc = toViewController
     
     progressUpdateObservers = nil
     transitionContainer = nil
@@ -433,22 +433,33 @@ internal extension Hero {
     forceNotInteractive = false
     progress = 0
     totalDuration = 0
-    
-    if let fvc = fvc, let tvc = tvc {
-      closureProcessForHeroDelegate(vc: fvc) {
-        $0.heroDidEndAnimatingTo?(viewController: tvc)
-        $0.heroDidEndTransition?()
-      }
-      
-      closureProcessForHeroDelegate(vc: tvc) {
-        $0.heroDidEndAnimatingFrom?(viewController: fvc)
-        $0.heroDidEndTransition?()
-      }
-    }
+
     
     if finished {
+      if let fvc = fvc, let tvc = tvc {
+        closureProcessForHeroDelegate(vc: fvc) {
+          $0.heroDidEndAnimatingTo?(viewController: tvc)
+          $0.heroDidEndTransition?()
+        }
+
+        closureProcessForHeroDelegate(vc: tvc) {
+          $0.heroDidEndAnimatingFrom?(viewController: fvc)
+          $0.heroDidEndTransition?()
+        }
+      }
       tContext?.finishInteractiveTransition()
     } else {
+      if let fvc = fvc, let tvc = tvc {
+        closureProcessForHeroDelegate(vc: fvc) {
+          $0.heroDidCancelAnimatingTo?(viewController: tvc)
+          $0.heroDidCancelTransition?()
+        }
+
+        closureProcessForHeroDelegate(vc: tvc) {
+          $0.heroDidCancelAnimatingFrom?(viewController: fvc)
+          $0.heroDidCancelTransition?()
+        }
+      }
       tContext?.cancelInteractiveTransition()
     }
     tContext?.completeTransition(finished)
diff --git a/Sources/HeroContext.swift b/Sources/HeroContext.swift
index a4999115..1d360f7b 100644
--- a/Sources/HeroContext.swift
+++ b/Sources/HeroContext.swift
@@ -154,10 +154,9 @@ extension HeroContext {
     view.layer.cornerRadius = oldCornerRadius
     view.alpha = oldAlpha
 
-    if !(view is UINavigationBar) {
+    if !(view is UINavigationBar), let contentView = snapshot.subviews.get(0) {
       // the Snapshot's contentView must have hold the cornerRadius value,
       // since the snapshot might not have maskToBounds set
-      let contentView = snapshot.subviews[0]
       contentView.layer.cornerRadius = view.layer.cornerRadius
       contentView.layer.masksToBounds = true
     }
@@ -184,9 +183,7 @@ extension HeroContext {
     snapshot.frame = containerView.convert(view.bounds, from: view)
     snapshot.heroID = view.heroID
 
-    if snapshotType != .noSnapshot {
-      hide(view: view)
-    }
+    hide(view: view)
 
     containerView.addSubview(snapshot)
     snapshotViews[view] = snapshot
@@ -206,7 +203,7 @@ extension HeroContext {
 // internal
 extension HeroContext {
   public func hide(view: UIView) {
-    if viewAlphas[view] == nil {
+    if viewAlphas[view] == nil, self[view]?.snapshotType != .noSnapshot {
       viewAlphas[view] = view.alpha
       view.alpha = 0
     }
diff --git a/Sources/HeroDefaultAnimator.swift b/Sources/HeroDefaultAnimator.swift
index 55504b6e..bfd31ccf 100644
--- a/Sources/HeroDefaultAnimator.swift
+++ b/Sources/HeroDefaultAnimator.swift
@@ -83,6 +83,9 @@ public class HeroDefaultAnimator: HeroAnimator {
   }
   
   public func clean() {
+    for vc in viewContexts.values {
+      vc.clean()
+    }
     viewContexts.removeAll()
   }
 }
diff --git a/Sources/HeroDefaultAnimatorViewContext.swift b/Sources/HeroDefaultAnimatorViewContext.swift
index 364359fe..81a883ef 100644
--- a/Sources/HeroDefaultAnimatorViewContext.swift
+++ b/Sources/HeroDefaultAnimatorViewContext.swift
@@ -124,6 +124,7 @@ internal class HeroDefaultAnimatorViewContext {
     snapshot.layer.add(anim, forKey: key)
     if key == "cornerRadius"{
       contentLayer?.add(anim, forKey: key)
+      snapshot.layer.add(anim, forKey: key)
     } else if key == "bounds.size"{
       let fromSize = (fromValue as? NSValue)!.cgSizeValue
       let toSize = (toValue as? NSValue)!.cgSizeValue
@@ -152,10 +153,17 @@ internal class HeroDefaultAnimatorViewContext {
    - Returns: a CALayer [keyPath:value] map for animation
    */
   func viewState(targetState: HeroTargetState) -> [String: Any] {
+    var targetState = targetState
     var rtn = [String: Any]()
 
     if let size = targetState.size {
-      rtn["bounds.size"] = NSValue(cgSize:size)
+      if targetState.useScaleBasedSizeChange ?? self.targetState.useScaleBasedSizeChange ?? false {
+        let currentSize = snapshot.bounds.size
+        targetState.append(.scale(x:size.width / currentSize.width,
+                                  y:size.height / currentSize.height))
+      } else {
+        rtn["bounds.size"] = NSValue(cgSize:size)
+      }
     }
     if let position = targetState.position {
       rtn["position"] = NSValue(cgPoint:position)
@@ -260,6 +268,11 @@ internal class HeroDefaultAnimatorViewContext {
     }
   }
 
+  func clean() {
+    snapshot.layer.removeAllAnimations()
+    contentLayer?.removeAllAnimations()
+  }
+
   init(animator: HeroDefaultAnimator, snapshot: UIView, targetState: HeroTargetState, appearing: Bool) {
     self.animator = animator
     self.snapshot = snapshot
diff --git a/Sources/HeroModifier.swift b/Sources/HeroModifier.swift
index d5755aa6..ab01253e 100644
--- a/Sources/HeroModifier.swift
+++ b/Sources/HeroModifier.swift
@@ -341,6 +341,14 @@ extension HeroModifier {
   public static var useNoSnapshot: HeroModifier = HeroModifier { targetState in
     targetState.snapshotType = .noSnapshot
   }
+
+  /**
+   Force Hero use scale based size animation. This will convert all .size modifier into .scale modifier.
+   This is to help Hero animate layers that doesn't support bounds animation. Also gives better performance.
+   */
+  public static var useScaleBasedSizeChange: HeroModifier = HeroModifier { targetState in
+    targetState.useScaleBasedSizeChange = true
+  }
 }
 
 // construct HeroModifier from heroModifierString
diff --git a/Sources/HeroTargetState.swift b/Sources/HeroTargetState.swift
index d3ae9bba..1180d470 100644
--- a/Sources/HeroTargetState.swift
+++ b/Sources/HeroTargetState.swift
@@ -59,6 +59,7 @@ public struct HeroTargetState {
   internal var cascade: (TimeInterval, CascadeDirection, Bool)?
   internal var ignoreSubviewModifiers: Bool?
   internal var useGlobalCoordinateSpace: Bool?
+  internal var useScaleBasedSizeChange: Bool?
   internal var snapshotType: HeroSnapshotType?
 
   internal var custom: [String:Any]?
@@ -67,6 +68,10 @@ public struct HeroTargetState {
     append(contentsOf: modifiers)
   }
 
+  mutating func append(_ modifier: HeroModifier) {
+    modifier.apply(&self)
+  }
+
   mutating func append(contentsOf modifiers: [HeroModifier]) {
     for modifier in modifiers {
       modifier.apply(&self)
diff --git a/Sources/HeroTypes.swift b/Sources/HeroTypes.swift
index 68355c63..83e1ef47 100644
--- a/Sources/HeroTypes.swift
+++ b/Sources/HeroTypes.swift
@@ -43,10 +43,13 @@ public protocol HeroProgressUpdateObserver {
 @objc public protocol HeroViewControllerDelegate {
   @objc optional func heroWillStartAnimatingFrom(viewController: UIViewController)
   @objc optional func heroDidEndAnimatingFrom(viewController: UIViewController)
+  @objc optional func heroDidCancelAnimatingFrom(viewController: UIViewController)
   
   @objc optional func heroWillStartTransition()
   @objc optional func heroDidEndTransition()
+  @objc optional func heroDidCancelTransition()
 
   @objc optional func heroWillStartAnimatingTo(viewController: UIViewController)
   @objc optional func heroDidEndAnimatingTo(viewController: UIViewController)
+  @objc optional func heroDidCancelAnimatingTo(viewController: UIViewController)
 }
diff --git a/Sources/MatchPreprocessor.swift b/Sources/MatchPreprocessor.swift
index 12fa651c..adc8208a 100644
--- a/Sources/MatchPreprocessor.swift
+++ b/Sources/MatchPreprocessor.swift
@@ -28,12 +28,18 @@ class MatchPreprocessor: BasePreprocessor {
       guard let id = tv.heroID, let fv = context.sourceView(for: id) else { continue }
 
       var tvState = context[tv] ?? HeroTargetState()
+      var fvState = context[fv] ?? HeroTargetState()
+
       if let zPosition = tvState.zPositionIfMatched {
-        tvState.append(contentsOf: [.zPosition(zPosition)])
+        fvState.append(.zPosition(zPosition))
+      }
+
+      if let zPosition = tvState.zPosition, fvState.zPosition != zPosition {
+        fvState.append(.zPosition(zPosition))
       }
-      tvState.source = id
 
-      var fvState = tvState
+      tvState.source = id
+      fvState.source = id
 
       tvState.opacity = 0
       if (fv is UILabel && !fv.isOpaque) || tv.alpha < 1 {
@@ -42,6 +48,7 @@ class MatchPreprocessor: BasePreprocessor {
       } else {
         fvState.opacity = nil
       }
+
       context[tv] = tvState
       context[fv] = fvState
     }