diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f91ff2b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,216 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+*.publishproj
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Python
+#############
+
+*.py[cod]
+
+# Packages
+*.egg
+*.egg-info
+dist/
+build/
+eggs/
+parts/
+var/
+sdist/
+develop-eggs/
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
diff --git a/Example/MusicPong/.gitignore b/Example/MusicPong/.gitignore
new file mode 100644
index 0000000..a12c48b
--- /dev/null
+++ b/Example/MusicPong/.gitignore
@@ -0,0 +1,224 @@
+# =============== #
+# Unity generated #
+# =============== #
+Temp/
+Obj/
+UnityGenerated/
+Library/
+
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+*.publishproj
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Python
+#############
+
+*.py[cod]
+
+# Packages
+*.egg
+*.egg-info
+dist/
+build/
+eggs/
+parts/
+var/
+sdist/
+develop-eggs/
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
diff --git a/Example/MusicPong/Assembly-CSharp-vs.csproj b/Example/MusicPong/Assembly-CSharp-vs.csproj
index 1cbb1d4..93f487d 100644
--- a/Example/MusicPong/Assembly-CSharp-vs.csproj
+++ b/Example/MusicPong/Assembly-CSharp-vs.csproj
@@ -19,7 +19,7 @@
 	<DebugType>full</DebugType>
 	<Optimize>false</Optimize>
 	<OutputPath>Temp\bin\Debug\</OutputPath>
-	<DefineConstants>DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_4;UNITY_4_3;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN</DefineConstants>
+	<DefineConstants>DEBUG;TRACE;UNITY_5_0_0;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_NONPRO;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_WEBPLAYER;ENABLE_SUBSTANCE;WEBPLUG;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE</DefineConstants>
 	<ErrorReport>prompt</ErrorReport>
 	<WarningLevel>4</WarningLevel>
 	<NoWarn>0169</NoWarn>
@@ -39,10 +39,10 @@
 	<Reference Include="System.Core" />
 	<Reference Include="System.Xml.Linq" />
 	<Reference Include="UnityEngine">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
+	  <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
 	</Reference>
 	<Reference Include="UnityEditor">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
+	  <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
 	</Reference>
   </ItemGroup>
   <ItemGroup>
@@ -51,6 +51,9 @@
      <Compile Include="Assets\Field.cs" />
      <Compile Include="Assets\Music.cs" />
      <Compile Include="Assets\Paddle.cs" />
+ <Reference Include="UnityEngine.UI">
+ <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
+ </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Example/MusicPong/Assembly-CSharp.csproj b/Example/MusicPong/Assembly-CSharp.csproj
index 1cbb1d4..93f487d 100644
--- a/Example/MusicPong/Assembly-CSharp.csproj
+++ b/Example/MusicPong/Assembly-CSharp.csproj
@@ -19,7 +19,7 @@
 	<DebugType>full</DebugType>
 	<Optimize>false</Optimize>
 	<OutputPath>Temp\bin\Debug\</OutputPath>
-	<DefineConstants>DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_4;UNITY_4_3;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN</DefineConstants>
+	<DefineConstants>DEBUG;TRACE;UNITY_5_0_0;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_NONPRO;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_WEBPLAYER;ENABLE_SUBSTANCE;WEBPLUG;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE</DefineConstants>
 	<ErrorReport>prompt</ErrorReport>
 	<WarningLevel>4</WarningLevel>
 	<NoWarn>0169</NoWarn>
@@ -39,10 +39,10 @@
 	<Reference Include="System.Core" />
 	<Reference Include="System.Xml.Linq" />
 	<Reference Include="UnityEngine">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
+	  <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
 	</Reference>
 	<Reference Include="UnityEditor">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
+	  <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
 	</Reference>
   </ItemGroup>
   <ItemGroup>
@@ -51,6 +51,9 @@
      <Compile Include="Assets\Field.cs" />
      <Compile Include="Assets\Music.cs" />
      <Compile Include="Assets\Paddle.cs" />
+ <Reference Include="UnityEngine.UI">
+ <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
+ </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Example/MusicPong/Assets/Ball.cs b/Example/MusicPong/Assets/Ball.cs
index 41bc1c5..f183331 100644
--- a/Example/MusicPong/Assets/Ball.cs
+++ b/Example/MusicPong/Assets/Ball.cs
@@ -17,16 +17,16 @@ public class Ball : MonoBehaviour {
         initialPosition = transform.position;
         initialVelocity = velocity;
 	}
-	
+
 	// Update is called once per frame
 	void Update () {
-        if( Music.CurrentSection.name.StartsWith( "Play" ) )
+        if( Music.CurrentSection.Name.StartsWith( "Play" ) )
         {
             CheckShot();
 
             if( shotMusicalTime > 0 )
             {
-                if( Music.isJustChanged )
+                if( Music.IsJustChanged )
                 {
                     --shotMusicalTime;
                 }
@@ -40,8 +40,8 @@ public class Ball : MonoBehaviour {
 
     void CheckShot()
     {
-        if( beamIndex < beamTimings.Length && Music.isNowChanged
-            && ( beamTimings[beamIndex].totalUnit - 4 == Music.Now.totalUnit ) )
+        if( beamIndex < beamTimings.Length && Music.IsNearChanged
+            && ( beamTimings[beamIndex].CurrentMusicalTime - 4 == Music.Near.CurrentMusicalTime ) )
         {
             Beam beam = (Instantiate( beamPrefab ) as GameObject).GetComponent<Beam>();
             beam.transform.parent = transform;
@@ -58,13 +58,13 @@ void UpdatePosition()
         {
             //side wall
             velocity.x = Mathf.Abs( velocity.x ) * -Mathf.Sign( transform.position.x );
-            Music.QuantizePlay( audio );
+            Music.QuantizePlay( GetComponent<AudioSource>() );
         }
         if( Field.FieldLength <= transform.position.y )
         {
             //roof
             velocity.y = Mathf.Abs( velocity.y ) * -Mathf.Sign( transform.position.y );
-            Music.QuantizePlay( audio, 7 );
+            Music.QuantizePlay( GetComponent<AudioSource>(), 7 );
         }
         else if( transform.position.y <= -Field.FieldLength )
         {
@@ -75,7 +75,7 @@ void UpdatePosition()
 
     public void OnShot()
     {
-        if( Music.CurrentSection.name == "Play3" )
+        if( Music.CurrentSection.Name == "Play3" )
         {
             shotMusicalTime = 2;
         }
diff --git a/Example/MusicPong/Assets/Beam.cs b/Example/MusicPong/Assets/Beam.cs
index 0dc15f6..aaebf51 100644
--- a/Example/MusicPong/Assets/Beam.cs
+++ b/Example/MusicPong/Assets/Beam.cs
@@ -25,7 +25,7 @@ public void Initialize( Timing timing )
             //effect
             float x = Mathf.Pow( beamPow, (-d - 0.5f) * beamScale );
             transform.localScale = new Vector3( 1.0f + x, 1.0f, 0.03f + 1.0f / x );
-            renderer.material.color = ( d > 0 ? Color.Lerp( Color.red, Color.clear, (d - 1) / 2.0f ) : Color.white );
+            GetComponent<Renderer>().material.color = ( d > 0 ? Color.Lerp( Color.red, Color.clear, (d - 1) / 2.0f ) : Color.white );
         }
         else
         {
@@ -33,7 +33,7 @@ public void Initialize( Timing timing )
             if( Music.Just < shotTiming )
             {
                 transform.localScale = Vector3.one;
-                renderer.material.color = Color.white;
+                GetComponent<Renderer>().material.color = Color.white;
             }
             else
             {
@@ -47,7 +47,7 @@ public void Initialize( Timing timing )
             Field.instance.ball.OnShot();
             if( Field.instance.paddle.OnShot( this.transform.position.x ) )
             {
-                audio.Play();
+                GetComponent<AudioSource>().Play();
             }
         }
 	}
diff --git a/Example/MusicPong/Assets/Field.cs b/Example/MusicPong/Assets/Field.cs
index a7bf4f0..07f9298 100644
--- a/Example/MusicPong/Assets/Field.cs
+++ b/Example/MusicPong/Assets/Field.cs
@@ -48,7 +48,7 @@ public class Level
 	
 	// Update is called once per frame
 	void Update () {
-        switch( Music.CurrentSection.name )
+        switch( Music.CurrentSection.Name )
         {
         case "Start":
             UpdateStart();
@@ -76,7 +76,7 @@ void UpdateStart()
         if( titleText.enabled )
         {
             titleText.color = Color.Lerp( Color.white, Color.clear, (float)Music.MusicalTime / 16.0f - 1.0f );
-            if( Music.IsNowChangedAt( 2 ) )
+            if( Music.IsNearChangedAt( 2 ) )
             {
                 titleText.enabled = false;
             }
@@ -95,7 +95,7 @@ void UpdateClear()
     {
         if( Music.IsJustChangedSection() )
         {
-            EndBar.renderer.material.color = Color.white;
+            EndBar.GetComponent<Renderer>().material.color = Color.white;
             clearText.enabled = true;
             if( paddle.totalDamage == 0 )
             {
@@ -113,7 +113,7 @@ void UpdateClear()
 
         EndBar.transform.localScale = Vector3.Lerp( EndBar.transform.localScale, endbarGameOverScale, 0.2f );
 
-        if( Music.IsJustChangedAt( Music.CurrentSection.StartTiming_.bar + 3 ) )
+        if( Music.IsJustChangedAt( Music.CurrentSection.StartTiming.Bar + 3 ) )
         {
             Music.Stop();
         }
@@ -129,12 +129,12 @@ void UpdateGameOver()
         {
             retryText.enabled = true;
             retryText.text = "Survived level: " + currentLevel + "/8\nClick to restart.";
-            EndBar.renderer.material.color = EndBarLerpColor;
+            EndBar.GetComponent<Renderer>().material.color = EndBarLerpColor;
         }
 
         EndBar.transform.localScale = Vector3.Lerp( EndBar.transform.localScale, endbarGameOverScale, 0.2f );
 
-        if( Music.IsJustChangedAt( Music.CurrentSection.StartTiming_.bar + 3 ) )
+        if( Music.IsJustChangedAt( Music.CurrentSection.StartTiming.Bar + 3 ) )
         {
             Music.Stop();
         }
@@ -159,14 +159,14 @@ void Restart()
 
     void UpdateColor()
     {
-        currentLevel = (Music.Just.bar - 2) / 4;
+        currentLevel = (Music.Just.Bar - 2) / 4;
 
-        EndBar.renderer.material.color = Color.Lerp( EndBarColor, EndBarLerpColor, (Mathf.Cos( Mathf.PI * (float)Music.MusicalTime / lerpMusicalTime ) + 1.0f) / 2.0f );
-        fieldMaterial.color = Color.Lerp( levels[currentLevel].materialColor, levels[currentLevel].lerpMaterialColor, (Mathf.Cos( Mathf.PI * (float)Music.MusicalTime / lerpMusicalTime ) + 1.0f) / 2.0f );
+		EndBar.GetComponent<Renderer>().material.color = Color.Lerp(EndBarColor, EndBarLerpColor, Music.MusicalCos(lerpMusicalTime));
+		fieldMaterial.color = Color.Lerp(levels[currentLevel].materialColor, levels[currentLevel].lerpMaterialColor, Music.MusicalCos(lerpMusicalTime));
 
         if( Music.IsJustChangedBar() )
         {
-            MainCamera.backgroundColor = Music.Just.bar % 2 == 0 ?
+            MainCamera.backgroundColor = Music.Just.Bar % 2 == 0 ?
                 levels[currentLevel].BGColor : levels[currentLevel].BGChangeColor;
         }
     }
diff --git a/Example/MusicPong/Assets/Music.cs b/Example/MusicPong/Assets/Music.cs
index 9411263..f20a30b 100644
--- a/Example/MusicPong/Assets/Music.cs
+++ b/Example/MusicPong/Assets/Music.cs
@@ -9,243 +9,267 @@
 using System.Collections.Generic;
 
 [ExecuteInEditMode]
+[RequireComponent(typeof(AudioSource))]
 public class Music : MonoBehaviour
 {
-	//editor params
-	public List<Section> sections;
-	//indexer
+	#region Section class
+	[Serializable]
+	public class Section
+	{
+		public string Name;
+		public int UnitPerBeat;
+		public int UnitPerBar;
+		public double Tempo;
+		public Timing StartTiming;
+		public int StartTimeSamples;
+
+		public Section(Timing startTiming, int mtBeat = 4, int mtBar = 16, double tempo = 120)
+		{
+			StartTiming = startTiming;
+			UnitPerBeat = mtBeat;
+			UnitPerBar = mtBar;
+			Tempo = tempo;
+		}
+
+		public void OnValidate(int startTimeSample)
+		{
+			StartTimeSamples = startTimeSample;
+		}
+
+		public override string ToString()
+		{
+			return string.Format("\"{0}\" startTiming:{1}, Tempo:{2}", Name, StartTiming.ToString(), Tempo);
+		}
+	}
+
 	public Section this[int index]
 	{
 		get
 		{
 			if( 0 <= index && index < SectionCount_ )
 			{
-				return sections[index];
+				return Sections[index];
 			}
 			else
 			{
-				Debug.LogWarning( "Section index out of range! index = " + index + ", SectionCount = " + SectionCount_ );
+				Debug.LogWarning("Section index out of range! index = " + index + ", SectionCount = " + SectionCount_);
 				return null;
 			}
 		}
 	}
+	#endregion
+
+	static Music Current_;
+	static List<Music> MusicList_ = new List<Music>();
+
+	#region editor params
+	public List<Section> Sections;
 
 	/// <summary>
 	/// Just for music that doesn't start with the first timesample.
 	/// if so, specify time samples before music goes into first timing = (0,0,0).
 	/// </summary>
-	public int delayTimeSamples = 0;
+	public int EntryPointSample = 0;
+
 	/// <summary>
 	/// put your debug GUIText to see current musical time & section info.
 	/// </summary>
-	public GUIText debugText;
-
-	[Serializable]
-	public class Section
-	{
-		public string name;
-		/// <summary>
-		/// how many MusicTime in a beat. maybe 4 or 3.
-		/// </summary>
-		public int mtBeat_;
-		/// <summary>
-		/// how many MusicTime in a bar.
-		/// </summary>
-		public int mtBar_;
-		/// <summary>
-		/// Musical Tempo. how many beats in a minutes.
-		/// </summary>
-		public double Tempo_;
-
-		public Timing StartTiming_;
-
-		public int StartTimeSamples_;
-		public int StartTotalUnit_ { get; private set; }
-		public bool isValidated_ { get; private set; }
-
-		public Section( Timing startTiming, int mtBeat = 4, int mtBar = 16, double Tempo = 120 )
-		{
-			StartTiming_ = startTiming;
-			mtBeat_ = mtBeat;
-			mtBar_ = mtBar;
-			Tempo_ = Tempo;
-		}
-
-		public void OnValidate( int startTimeSample, int startTotalUnit )
-		{
-			StartTimeSamples_ = startTimeSample;
-			StartTotalUnit_ = startTotalUnit;
-			isValidated_ = true;
-		}
-
-		public override string ToString()
-		{
-			return string.Format( "\"{0}\" startTiming:{1}, Tempo:{2}", name, StartTiming_.ToString(), Tempo_ );
-		}
-	}
-
-	public class SoundCue
-	{
-		public SoundCue( AudioSource source ) { this.source = source; }
-		public AudioSource source { get; private set; }
-
-		public void Play()
-		{
-			source.Play();
-		}
-		public void Stop()
-		{
-			source.Stop();
-		}
-		public void Pause()
-		{
-			source.Pause();
-		}
-		public bool IsPlaying()
-		{
-			return source.isPlaying;
-		}
-		public long GetTimeSamples()
-		{
-			return source.timeSamples;
-		}
-		public float GetTime()
-		{
-			return source.time;
-		}
-		public void SetVolume( float volume )
-		{
-			source.volume = volume;
-		}
-	}
+	//public GUIText DebugText;
+	#endregion
 
-	static Music Current;
-	static List<Music> MusicList = new List<Music>();
-	
 	#region public static properties
+	public static bool IsPlaying { get { return Current_.IsPlaying_; } }
 	/// <summary>
-	/// means last timing.
+	/// last timing.
 	/// </summary>
-	public static Timing Just { get { return Current.Just_; } }
+	public static Timing Just { get { return Current_.just_; } }
 	/// <summary>
-	/// means nearest timing.
+	/// nearest timing.
 	/// </summary>
-	public static Timing Now { get { return Current.Now_; } }
+	public static Timing Near { get { return Current_.near_; } }
 	/// <summary>
 	/// is Just changed in this frame or not.
 	/// </summary>
-	public static bool isJustChanged { get { return Current.isJustChanged_; } }
+	public static bool IsJustChanged { get { return Current_.isJustChanged_; } }
 	/// <summary>
-	/// is Now changed in this frame or not.
+	/// is Near changed in this frame or not.
 	/// </summary>
-	public static bool isNowChanged { get { return Current.isNowChanged_; } }
+	public static bool IsNearChanged { get { return Current_.isNearChanged_; } }
 	/// <summary>
 	/// is currently former half in a MusicTimeUnit, or last half.
 	/// </summary>
-	public static bool isFormerHalf { get { return Current.isFormerHalf_; } }
+	public static bool IsFormerHalf { get { return Current_.isFormerHalf_; } }
 	/// <summary>
 	/// delta time from JustChanged.
 	/// </summary>
-	public static double dtFromJust { get { return Current.dtFromJust_; } }
+	public static double TimeSecFromJust { get { return Current_.timeSecFromJust_; } }
 	/// <summary>
 	/// how many times you repeat current music/block.
 	/// </summary>
-	public static int numRepeat { get { return Current.numRepeat_; } }
+	public static int NumRepeat { get { return Current_.numRepeat_; } }
 	/// <summary>
 	/// returns how long from nearest Just timing with sign.
 	/// </summary>
-	public static double lag{ get{ return Current.lag_; } }
+	public static double Lag { get { return Current_.Lag_; } }
 	/// <summary>
 	/// returns how long from nearest Just timing absolutely.
 	/// </summary>
-	public static double lagAbs{ get{ return Current.lagAbs_; } }
+	public static double LagAbs { get { return Current_.LagAbs_; } }
 	/// <summary>
 	/// returns normalized lag.
 	/// </summary>
-	public static double lagUnit{ get{ return Current.lagUnit_; } }
-
-	public static double MusicalTime { get { return Current.MusicalTime_; } }   //sec per MusicTimeUnit
-	public static float AudioTime { get{ return Current.AudioTime_; } }		 //sec
-	public static long TimeSamples { get{ return Current.TimeSamples_; } }	  //sample
-
-	public static int mtBar { get { return Current.mtBar_; } }
-	public static int mtBeat { get { return Current.mtBeat_; } }
-	public static double MusicTimeUnit { get { return Current.MusicTimeUnit_; } }
-
-	public static string CurrentMusicName { get { return Current.name; } }
-	public static SoundCue CurrentSource { get { return Current.MusicSource; } }
+	public static double LagUnit { get { return Current_.LagUnit_; } }
+	/// <summary>
+	/// sec / musicalUnit
+	/// </summary>
+	public static double MusicTimeUnit { get { return Current_.musicTimeUnit_; } }
+	/// <summary>
+	/// current musical time based on MusicalTimeUnit
+	/// **warning** if CurrentSection.UnitPerBar changed, this is not continuous.
+	/// </summary>
+	public static float MusicalTime { get { return Current_.MusicalTime_; } }
+	/// <summary>
+	/// current musical time based on MusicalBar.
+	/// This is always continuous(MusicalTime is not).
+	/// </summary>
+	public static float MusicalTimeBar { get { return Current_.MusicalTimeBar_; } }
+	/// <summary>
+	/// dif from timing to Just on musical time unit.
+	/// </summary>
+	/// <param name="timing"></param>
+	/// <returns></returns>
+	public static float MusicalTimeFrom(Timing timing)
+	{
+		int index = 0;
+		for( int i=0; i<SectionCount; ++i )
+		{
+			if( i + 1 < SectionCount )
+			{
+				if( timing < Current_[i+1].StartTiming )
+				{
+					index = i;
+					break;
+				}
+			}
+			else
+			{
+				index = i;
+			}
+		}
+		int startIndex = Mathf.Min(index, Current_.sectionIndex_);
+		int endIndex = Mathf.Max(index, Current_.sectionIndex_);
+		Timing currentTiming = new Timing(timing < Just ? timing : Just);
+		Timing endTiming = (timing > Just ? timing : Just);
+		int musicalTime = 0;
+		for( int i=startIndex; i<=endIndex; ++i )
+		{
+			if( i < endIndex )
+			{
+				musicalTime += Current_[i+1].StartTiming.GetMusicalTime(Current_[i]) - currentTiming.GetMusicalTime(Current_[i]);
+				currentTiming.Copy(Current_[i+1].StartTiming);
+			}
+			else
+			{
+				musicalTime += endTiming.GetMusicalTime(Current_[i]) - currentTiming.GetMusicalTime(Current_[i]);
+			}
+		}
+		return (float)((timing > Just ? -1 : 1) * musicalTime + TimeSecFromJust / MusicTimeUnit);
+	}
+	/// <summary>
+	/// current audio play time in sec.
+	/// </summary>
+	public static float AudioTimeSec { get { return Current_.AudioTimeSec_; } }
+	/// <summary>
+	/// current audio play sample
+	/// </summary>
+	public static int TimeSamples { get { return Current_.TimeSamples_; } }
+	/// <summary>
+	/// returns musically synced cos wave.
+	/// if default( MusicalCos(16,0,0,1),
+	/// starts from max=1,
+	/// reaches min=0 on MusicalTime = cycle/2 = 8,
+	/// back to max=1 on MusicalTIme = cycle = 16.
+	/// </summary>
+	/// <param name="cycle">wave cycle in musical unit</param>
+	/// <param name="offset">wave offset in musical unit</param>
+	/// <param name="min"></param>
+	/// <param name="max"></param>
+	/// <returns></returns>
+	public static float MusicalCos(float cycle = 16, float offset = 0, float min = 0, float max = 1)
+	{
+		return Mathf.Lerp(min, max, ((float)Math.Cos(Math.PI * 2 * (MusicalTime + offset) / cycle) + 1.0f)/2.0f);
+	}
 
-	public static Section CurrentSection { get { return Current.CurrentSection_; } }
-	public static int SectionCount { get { return Current.SectionCount_; } }
+	public static int UnitPerBar { get { return Current_.UnitPerBar_; } }
+	public static int UnitPerBeat { get { return Current_.UnitPerBeat_; } }
+	public static AudioSource CurrentSource { get { return Current_.musicSource_; } }
+	public static Section CurrentSection { get { return Current_.CurrentSection_; } }
+	public static int SectionCount { get { return Current_.SectionCount_; } }
+	public static string CurrentMusicName { get { return Current_.name; } }
+	public static Section GetSection(int index)
+	{
+		return Current_[index];
+	}
+	public static Section GetSection(string name)
+	{
+		return Current_.Sections.Find((Section s) => s.Name == name);
+	}
 	#endregion
 
 	#region public static predicates
-	public static bool IsJustChangedWhen( System.Predicate<Timing> pred )
+	public static bool IsJustChangedWhen(System.Predicate<Timing> pred)
 	{
-		return Current.IsJustChangedWhen_( pred );
+		return Current_.IsJustChangedWhen_(pred);
 	}
 	public static bool IsJustChangedBar()
 	{
-		return Current.IsJustChangedBar_();
+		return Current_.IsJustChangedBar_();
 	}
 	public static bool IsJustChangedBeat()
 	{
-		return Current.IsJustChangedBeat_();
+		return Current_.IsJustChangedBeat_();
 	}
-	public static bool IsJustChangedAt( int bar = 0, int beat = 0, int unit = 0 )
+	public static bool IsJustChangedAt(int bar = 0, int beat = 0, int unit = 0)
 	{
-		return Current.IsJustChangedAt_( bar, beat, unit );
+		return Current_.IsJustChangedAt_(bar, beat, unit);
 	}
-	public static bool IsJustChangedAt( Timing t )
+	public static bool IsJustChangedAt(Timing t)
 	{
-		return Current.IsJustChangedAt_( t.bar, t.beat, t.unit );
+		return Current_.IsJustChangedAt_(t.Bar, t.Beat, t.Unit);
 	}
-	public static bool IsJustChangedSection( string sectionName = "" )
+	public static bool IsJustChangedSection(string sectionName = "")
 	{
-		Section targetSection = (sectionName == "" ? CurrentSection : GetSection( sectionName ));
+		Section targetSection = (sectionName == "" ? CurrentSection : GetSection(sectionName));
 		if( targetSection != null )
 		{
-			return IsJustChangedAt( targetSection.StartTiming_ );
+			return IsJustChangedAt(targetSection.StartTiming);
 		}
 		else
 		{
-			Debug.LogWarning( "Can't find section name: " + sectionName );
+			Debug.LogWarning("Can't find section name: " + sectionName);
 			return false;
 		}
 	}
 
-	public static bool IsNowChangedWhen( System.Predicate<Timing> pred )
-	{
-		return Current.IsNowChangedWhen_(pred);
-	}
-	public static bool IsNowChangedBar()
+	public static bool IsNearChangedWhen(System.Predicate<Timing> pred)
 	{
-		return Current.IsNowChangedBar_();
+		return Current_.IsNearChangedWhen_(pred);
 	}
-	public static bool IsNowChangedBeat()
+	public static bool IsNearChangedBar()
 	{
-		return Current.IsNowChangedBeat_();
+		return Current_.IsNearChangedBar_();
 	}
-	public static bool IsNowChangedAt( int bar, int beat = 0, int unit = 0 )
+	public static bool IsNearChangedBeat()
 	{
-		return Current.IsNowChangedAt_(bar,beat,unit);
+		return Current_.IsNearChangedBeat_();
 	}
-	public static bool IsNowChangedAt( Timing t )
+	public static bool IsNearChangedAt(int bar, int beat = 0, int unit = 0)
 	{
-		return Current.IsNowChangedAt_( t.bar, t.beat, t.unit );
+		return Current_.IsNearChangedAt_(bar, beat, unit);
 	}
-
-	public static Section GetSection( int index )
-	{
-		return Current[index];
-	}
-	public static Section GetSection( string name )
+	public static bool IsNearChangedAt(Timing t)
 	{
-		return Current.sections.Find( ( Section s ) => s.name == name );
-	}
-	public static float MusicalTimeFrom( Timing timing )
-	{
-		return (Now - timing) + (float)lagUnit;
+		return Current_.IsNearChangedAt_(t.Bar, t.Beat, t.Unit);
 	}
 	#endregion
 
@@ -254,148 +278,163 @@ public static float MusicalTimeFrom( Timing timing )
 	/// Change Current Music.
 	/// </summary>
 	/// <param name="MusicName">name of the GameObject that include Music</param>
-	public static void Play( string MusicName ) { MusicList.Find( ( Music m ) => m.name == MusicName ).PlayStart(); }
+	public static void Play(string MusicName) { MusicList_.Find((Music m) => m.name == MusicName).PlayStart(); }
 	/// <summary>
 	/// Quantize to musical time.
 	/// </summary>
-	public static void QuantizePlay( AudioSource source, int transpose = 0 )
+	public static void QuantizePlay(AudioSource source, int transpose = 0, float allowRange = 0.3f)
 	{
-		source.pitch = Mathf.Pow( pitchUnit, transpose );
-		if( isFormerHalf && lagUnit < 0.3f )
+		source.pitch = Mathf.Pow(PITCH_UNIT, transpose);
+		if( IsFormerHalf && LagUnit < allowRange )
 		{
 			source.Play();
 		}
 		else
 		{
-			Current.QuantizedCue.Add( source );
+			Current_.quantizedCue_.Add(source);
 		}
 	}
-	public static bool IsPlaying() { return Current.MusicSource.IsPlaying(); }
-	public static void Pause() { Current.MusicSource.Pause(); }
-	public static void Resume() { Current.MusicSource.Play(); }
-	public static void Stop() { Current.MusicSource.Stop(); }
-	public static void Seek( Timing timing )
+	public static void Pause() { Current_.musicSource_.Pause(); }
+	public static void Resume() { Current_.musicSource_.Play(); }
+	public static void Stop() { Current_.musicSource_.Stop(); }
+	public static void Seek(Timing timing)
 	{
-		Current.MusicSource.source.timeSamples = (int)(timing.totalUnit * MusicTimeUnit * Current.SamplingRate);
+		Section section = null;
+		for( int i=0; i<SectionCount; ++i )
+		{
+			if( i + 1 < SectionCount )
+			{
+				if( timing < Current_[i+1].StartTiming )
+				{
+					section = Current_[i];
+				}
+			}
+			else
+			{
+				section = Current_[i];
+			}
+		}
+		int deltaMT = (timing.GetMusicalTime(section) - section.StartTiming.GetMusicalTime(section));
+		Current_.musicSource_.timeSamples = section.StartTimeSamples + (int)(deltaMT* MusicTimeUnit * Current_.samplingRate_);
 	}
-	public static void SeekToSection( string sectionName )
+	public static void SeekToSection(string sectionName)
 	{
-		Section targetSection = GetSection( sectionName );
+		Section targetSection = GetSection(sectionName);
 		if( targetSection != null )
 		{
-			Current.MusicSource.source.timeSamples = targetSection.StartTimeSamples_;
-			Current.SectionIndex = Current.sections.IndexOf( targetSection );
-			Current.OnSectionChanged();
+			Current_.musicSource_.timeSamples = targetSection.StartTimeSamples;
+			Current_.sectionIndex_ = Current_.Sections.IndexOf(targetSection);
+			Current_.OnSectionChanged();
 		}
 		else
 		{
-			Debug.LogWarning( "Can't find section name: " + sectionName );
+			Debug.LogWarning("Can't find section name: " + sectionName);
 		}
 	}
-	public static void SetVolume( float volume )
+	public static void SetVolume(float volume)
 	{
-		Current.MusicSource.SetVolume( volume );
+		Current_.musicSource_.volume = volume;
 	}
 	#endregion
 
-	#region private properties
-	private Timing Now_;
-	private Timing Just_;
+	#region private params
+	private Timing just_;
+	private Timing near_;
 	private bool isJustChanged_;
-	private bool isNowChanged_;
+	private bool isNearChanged_;
 	private bool isFormerHalf_;
-	private double dtFromJust_;
+	private double timeSecFromJust_;
 	private int numRepeat_;
-	private double MusicTimeUnit_;
+	private double musicTimeUnit_;
+
+	private AudioSource musicSource_;
+	private int sectionIndex_;
+	private int currentSample_;
+
+	private int samplingRate_;
+	private int samplesPerUnit_;
+	private int samplesPerBeat_;
+	private int samplesPerBar_;
+	private int samplesInLoop_;
+
+	private Timing oldNear_, oldJust_;
+	private int numLoopBar_;
+	private List<AudioSource> quantizedCue_ = new List<AudioSource>();
+	private static readonly float PITCH_UNIT = Mathf.Pow(2.0f, 1.0f / 12.0f);
+	#endregion
 
-	private double lag_
+	#region private properties
+	private double Lag_
 	{
 		get
 		{
-			if ( isFormerHalf_ )
-				return dtFromJust_;
+			if( isFormerHalf_ )
+				return timeSecFromJust_;
 			else
-				return dtFromJust_ - MusicTimeUnit_;
+				return timeSecFromJust_ - musicTimeUnit_;
 		}
 	}
-	private double lagAbs_
+	private double LagAbs_
 	{
 		get
 		{
-			if ( isFormerHalf_ )
-				return dtFromJust_;
+			if( isFormerHalf_ )
+				return timeSecFromJust_;
 			else
-				return MusicTimeUnit_ - dtFromJust_;
-		}
-	}
-	private double lagUnit_ { get { return lag / MusicTimeUnit_; } }
-	private double MusicalTime_ { get { return Just.totalUnit + dtFromJust / MusicTimeUnit; } }
-	private float AudioTime_ { get { return MusicSource.GetTime(); } }
-	private long TimeSamples_ { get { return MusicSource.GetTimeSamples(); } }
-	private int SectionCount_ { get { return sections.Count; } }
-	private int mtBar_ { get { return CurrentSection.mtBar_; } }
-	private int mtBeat_ { get { return CurrentSection.mtBeat_; } }
-	private bool isPlaying { get { return MusicSource != null && MusicSource.IsPlaying(); } }
+				return musicTimeUnit_ - timeSecFromJust_;
+		}
+	}
+	private double LagUnit_ { get { return Lag / musicTimeUnit_; } }
+	private float MusicalTime_ { get { return (float)(just_.GetMusicalTime(CurrentSection_) + timeSecFromJust_ / musicTimeUnit_); } }
+	private float MusicalTimeBar_ { get { return MusicalTime_/CurrentSection_.UnitPerBar; } }
+	private float AudioTimeSec_ { get { return musicSource_.time; } }
+	private int TimeSamples_ { get { return musicSource_.timeSamples; } }
+	private int SectionCount_ { get { return Sections.Count; } }
+	private int UnitPerBar_ { get { return CurrentSection.UnitPerBar; } }
+	private int UnitPerBeat_ { get { return CurrentSection.UnitPerBeat; } }
+	private bool IsPlaying_ { get { return musicSource_ != null && musicSource_.isPlaying; } }
+	private Section CurrentSection_ { get { return Sections[sectionIndex_]; } }
 	#endregion
 
 	#region private predicates
-	private bool IsNowChangedWhen_( System.Predicate<Timing> pred )
+	private bool IsNearChangedWhen_(System.Predicate<Timing> pred)
 	{
-		return isNowChanged_ && pred( Now_ );
+		return isNearChanged_ && pred(near_);
 	}
-	private bool IsNowChangedBar_()
+	private bool IsNearChangedBar_()
 	{
-		return isNowChanged_ && Now_.barUnit == 0;
+		return isNearChanged_ && near_.Beat == 0 && near_.Unit == 0;
 	}
-	private bool IsNowChangedBeat_()
+	private bool IsNearChangedBeat_()
 	{
-		return isNowChanged_ && Now_.unit == 0;
+		return isNearChanged_ && near_.Unit == 0;
 	}
-	private bool IsNowChangedAt_( int bar, int beat = 0, int unit = 0 )
+	private bool IsNearChangedAt_(int bar, int beat = 0, int unit = 0)
 	{
-		return isNowChanged_ &&
-			Now_.bar == bar && Now_.beat == beat && Now_.unit == unit;
+		return isNearChanged_ &&
+			near_.Bar == bar && near_.Beat == beat && near_.Unit == unit;
 	}
-	private bool IsJustChangedWhen_( System.Predicate<Timing> pred )
+	private bool IsJustChangedWhen_(System.Predicate<Timing> pred)
 	{
-		return isJustChanged_ && pred( Just_ );
+		return isJustChanged_ && pred(just_);
 	}
 	private bool IsJustChangedBar_()
 	{
-		return isJustChanged_ && Just_.barUnit == 0;
+		return isJustChanged_ && just_.Beat == 0 && just_.Unit == 0;
 	}
 	private bool IsJustChangedBeat_()
 	{
-		return isJustChanged_ && Just_.unit == 0;
+		return isJustChanged_ && just_.Unit == 0;
 	}
-	private bool IsJustChangedAt_( int bar = 0, int beat = 0, int unit = 0 )
+	private bool IsJustChangedAt_(int bar = 0, int beat = 0, int unit = 0)
 	{
 		return isJustChanged_ &&
-			Just_.bar == bar && Just_.beat == beat && Just_.unit == unit;
+			just_.Bar == bar && just_.Beat == beat && just_.Unit == unit;
 	}
 	#endregion
 
-	#region private params
-	//music current params
-	SoundCue MusicSource;
-	int SectionIndex;
-	Section CurrentSection_ { get { return sections[SectionIndex]; } }
-	List<AudioSource> QuantizedCue = new List<AudioSource>();
-
-	//readonly params
-	static readonly float pitchUnit = Mathf.Pow( 2.0f, 1.0f / 12.0f );
-	int SamplingRate;// = 44100;
-	long SamplesPerUnit;
-	long SamplesPerBeat;
-	long SamplesPerBar;
-	long SamplesInLoop;
-
-	//others
-	Timing OldNow, OldJust;
-	int NumLoopBar;
-	#endregion
 
-	#region Initialize & Update
+	#region private functions
 	void Awake()
 	{
 #if UNITY_EDITOR
@@ -405,21 +444,21 @@ void Awake()
 			return;
 		}
 #endif
-		MusicList.Add( this );
-		if( Current == null || audio.playOnAwake )
+		MusicList_.Add(this);
+		musicSource_ = GetComponent<AudioSource>();
+		if( Current_ == null || musicSource_.playOnAwake )
 		{
-			Current = this;
+			Current_ = this;
 		}
-		MusicSource = new SoundCue( audio );
-		SamplingRate = audio.clip.frequency;
-		if( audio.loop )
+		samplingRate_ = musicSource_.clip.frequency;
+		if( musicSource_.loop )
 		{
-			SamplesInLoop = audio.clip.samples;
-			Section lastSection = sections[sections.Count - 1];
-			long samplesPerUnit = (long)(SamplingRate * (60.0 / (lastSection.Tempo_ * lastSection.mtBeat_)));
-			long samplesPerBar = samplesPerUnit * lastSection.mtBar_;
-			NumLoopBar = lastSection.StartTiming_.bar +
-				Mathf.RoundToInt( (float)(SamplesInLoop - lastSection.StartTimeSamples_) / (float)samplesPerBar );
+			samplesInLoop_ = musicSource_.clip.samples;
+			Section lastSection = Sections[Sections.Count - 1];
+			double beatSec = (60.0 / lastSection.Tempo);
+			int samplesPerBar = (int)(samplingRate_ * lastSection.UnitPerBar * (beatSec/lastSection.UnitPerBeat));
+			numLoopBar_ = lastSection.StartTiming.Bar +
+				Mathf.RoundToInt((float)(samplesInLoop_ - lastSection.StartTimeSamples) / (float)samplesPerBar);
 		}
 
 		Initialize();
@@ -435,7 +474,7 @@ void Start()
 	// Update is called once per frame
 	void Update()
 	{
-		if( isPlaying )
+		if( IsPlaying_ )
 		{
 			UpdateTiming();
 		}
@@ -443,251 +482,206 @@ void Update()
 
 	void OnValidate()
 	{
-		if( SamplingRate == 0 )
+		if( musicSource_ == null )
 		{
-			SamplingRate = (audio != null ? audio.clip.frequency : 44100);
+			musicSource_ = GetComponent<AudioSource>();
+		}
+		if( samplingRate_ == 0 )
+		{
+			samplingRate_ = (musicSource_ != null && musicSource_.clip != null ? musicSource_.clip.frequency : 44100);
 		}
 
-		if( sections == null || sections.Count == 0 )
+		if( Sections == null || Sections.Count == 0 )
 		{
-			sections = new List<Section>();
-			sections.Add( new Section( new Timing( 0 ), 4, 16, 120 ) );
-			sections[0].OnValidate( delayTimeSamples, 0 );
+			Sections = new List<Section>();
+			Sections.Add(new Section(new Timing(0), 4, 16, 120));
+			Sections[0].OnValidate(EntryPointSample);
 		}
 		else
 		{
 			bool isValidated = true;
-			int timeSamples = delayTimeSamples;
-			int totalUnit = 0;
-			for( int i = 0; i < sections.Count; i++ )
+			int timeSamples = EntryPointSample;
+			for( int i = 0; i < Sections.Count; i++ )
 			{
-				if( sections[i].StartTotalUnit_ != totalUnit || sections[i].StartTimeSamples_ != timeSamples ) isValidated = false;
+				if( Sections[i].StartTimeSamples != timeSamples ) isValidated = false;
 				if( !isValidated )
 				{
 					isValidated = false;
-					sections[i].OnValidate( timeSamples, totalUnit );
+					Sections[i].OnValidate(timeSamples);
 				}
-				if( i+1 < sections.Count )
+				if( i+1 < Sections.Count )
 				{
-					int d = (sections[i+1].StartTiming_.bar  - sections[i].StartTiming_.bar)  * sections[i].mtBar_
-						   +(sections[i+1].StartTiming_.beat - sections[i].StartTiming_.beat) * sections[i].mtBeat_
-						   +(sections[i+1].StartTiming_.unit - sections[i].StartTiming_.unit);
-					totalUnit += d;
-					timeSamples += (int)((d / sections[i].mtBeat_) * (60.0f / sections[i].Tempo_) * SamplingRate);
+					int d = (Sections[i+1].StartTiming.Bar  - Sections[i].StartTiming.Bar)  * Sections[i].UnitPerBar
+						   +(Sections[i+1].StartTiming.Beat - Sections[i].StartTiming.Beat) * Sections[i].UnitPerBeat
+						   +(Sections[i+1].StartTiming.Unit - Sections[i].StartTiming.Unit);
+					timeSamples += (int)((d / Sections[i].UnitPerBeat) * (60.0f / Sections[i].Tempo) * samplingRate_);
 				}
 			}
 		}
 	}
 
+	void OnDestroy()
+	{
+		MusicList_.Remove(this);
+	}
+
 	void Initialize()
 	{
-		if( Current != null && isJustChanged && Just.totalUnit == 0 )
-		{
-			Now_ = new Timing( 0, 0, 0 );
-			isJustChanged_ = true;
-		}
-		else
-		{
-			Now_ = new Timing( 0, 0, -1 );
-			isJustChanged_ = false;
-		}
-		Just_ = new Timing( Now_ );
-		OldNow = new Timing( Now_ );
-		OldJust = new Timing( Just_ );
-		dtFromJust_ = 0;
+		isJustChanged_ = false;
+		isNearChanged_ = false;
+		near_ = new Timing(0, 0, -1);
+		just_ = new Timing(near_);
+		oldNear_ = new Timing(near_);
+		oldJust_ = new Timing(just_);
+		timeSecFromJust_ = 0;
 		isFormerHalf_ = true;
 		numRepeat_ = 0;
 	}
 
 	void OnSectionChanged()
 	{
-		if( sections == null || sections.Count == 0 ) return;
-		if( CurrentSection_.Tempo_ > 0.0f )
+		if( Sections == null || Sections.Count == 0 ) return;
+		if( CurrentSection_.Tempo > 0.0f )
 		{
-			SamplesPerUnit = (long)( SamplingRate * ( 60.0 / ( CurrentSection_.Tempo_ * CurrentSection_.mtBeat_ ) ) );
-			SamplesPerBeat = SamplesPerUnit*CurrentSection_.mtBeat_;
-			SamplesPerBar = SamplesPerUnit*CurrentSection_.mtBar_;
-			MusicTimeUnit_ = (double)SamplesPerUnit / (double)SamplingRate;
+			double beatSec = (60.0 / CurrentSection_.Tempo);
+			samplesPerUnit_ = (int)(samplingRate_ * (beatSec/CurrentSection_.UnitPerBeat));
+			samplesPerBeat_ =(int)(samplingRate_ * beatSec);
+			samplesPerBar_ = (int)(samplingRate_ * CurrentSection_.UnitPerBar * (beatSec/CurrentSection_.UnitPerBeat));
+			musicTimeUnit_ = (double)samplesPerUnit_ / (double)samplingRate_;
 		}
 		else
 		{
-			SamplesPerUnit = int.MaxValue;
-			SamplesPerBeat = int.MaxValue;
-			SamplesPerBar = int.MaxValue;
-			MusicTimeUnit_ = int.MaxValue;
+			samplesPerUnit_ = 0;
+			samplesPerBeat_ = 0;
+			samplesPerBar_ = 0;
+			musicTimeUnit_ = 0;
 		}
 	}
 
 	void PlayStart()
 	{
-		if ( Current != null && IsPlaying() )
+		if( Current_ != null && IsPlaying )
 		{
 			Stop();
 		}
-		if( Current.debugText != null )
-		{
-			Current.debugText.text = "";
-		}
 
-		Current = this;
+		Current_ = this;
 		Initialize();
-		MusicSource.Play();
+		musicSource_.Play();
 	}
 
 	void UpdateTiming()
 	{
-		isNowChanged_ = false;
-		isJustChanged_ = false;
-		
-		if( SectionIndex < 0 || sections.Count <= SectionIndex )
+		// find section index
+		int newIndex = sectionIndex_;
+		int oldSample = currentSample_;
+		currentSample_ = musicSource_.timeSamples;
+		if( sectionIndex_ + 1 >= Sections.Count )
 		{
-			Debug.LogWarning( "Music:" + name + " has invalid SectionIndex = " + SectionIndex + ", sections.Count = " + sections.Count );
-			return;
-		}
-		long numSamples = MusicSource.GetTimeSamples();
-
-
-		int NewIndex = -1;
-		for( int i = SectionIndex; i < sections.Count; i++ )
-		{
-			if( sections[i].StartTimeSamples_ <= numSamples && (sections.Count <= i + 1 || numSamples < sections[i + 1].StartTimeSamples_) )
+			if( currentSample_ < oldSample )
 			{
-				NewIndex = i;
-				break;
+				newIndex = 0;
 			}
 		}
-		if( NewIndex < 0 )
+		else
 		{
-			if( 0 <= numSamples && numSamples < delayTimeSamples )
-			{
-				NewIndex = 0;
-				Initialize();
-				OnSectionChanged();
-			}
-			else
+			if( Sections[sectionIndex_ + 1].StartTimeSamples <= currentSample_ )
 			{
-				for( int i = 0; i < SectionIndex; i++ )
-				{
-					if( sections[i].StartTimeSamples_ <= numSamples && numSamples < sections[i + 1].StartTimeSamples_ )
-					{
-						NewIndex = i;
-					}
-				}
+				newIndex = sectionIndex_ + 1;
 			}
 		}
 
-		if( NewIndex != SectionIndex )
+		if( newIndex != sectionIndex_ )
 		{
-			SectionIndex = NewIndex;
+			sectionIndex_ = newIndex;
 			OnSectionChanged();
 		}
 
-		numSamples -= CurrentSection_.StartTimeSamples_;
-		if ( numSamples >= 0 )
-		{
-			Just_.bar = (int)( numSamples / SamplesPerBar ) + CurrentSection_.StartTiming_.bar;
-			Just_.beat = (int)((numSamples % SamplesPerBar) / SamplesPerBeat) +CurrentSection_.StartTiming_.beat;
-			Just_.unit = (int)(((numSamples % SamplesPerBar) % SamplesPerBeat) / SamplesPerUnit) +CurrentSection_.StartTiming_.unit;
-			if( Just_.unit >= CurrentSection_.mtBeat_ )
+		// calc current timing
+		isNearChanged_ = false;
+		isJustChanged_ = false;
+		int sectionSample = currentSample_ - CurrentSection_.StartTimeSamples;
+		if( sectionSample >= 0 )
+		{
+			just_.Bar = (int)(sectionSample / samplesPerBar_) + CurrentSection_.StartTiming.Bar;
+			just_.Beat = (int)((sectionSample % samplesPerBar_) / samplesPerBeat_) + CurrentSection_.StartTiming.Beat;
+			just_.Unit = (int)(((sectionSample % samplesPerBar_) % samplesPerBeat_) / samplesPerUnit_) + CurrentSection_.StartTiming.Unit;
+			just_.Fix(CurrentSection_);
+			if( sectionIndex_ + 1 >= Sections.Count )
 			{
-				Just_.beat += (int)(Just_.unit / CurrentSection_.mtBeat_);
-				Just_.unit %= CurrentSection_.mtBeat_;
+				if( numLoopBar_ > 0 )
+				{
+					while( just_.Bar >= numLoopBar_ )
+					{
+						just_.Decrement(CurrentSection_);
+					}
+				}
 			}
-			int barUnit = Just_.beat * CurrentSection_.mtBeat_ + Just_.unit;
-			if( barUnit >= CurrentSection_.mtBar_ )
+			else
 			{
-				Just_.bar += (int)(barUnit / CurrentSection_.mtBar_);
-				Just_.beat = 0;
-				Just_.unit = (barUnit % CurrentSection_.mtBar_);
-				if( Just_.unit >= CurrentSection_.mtBeat_ )
+				while( just_ >= Sections[sectionIndex_+1].StartTiming )
 				{
-					Just_.beat += (int)(Just_.unit / CurrentSection_.mtBeat_);
-					Just_.unit %= CurrentSection_.mtBeat_;
+					just_.Decrement(CurrentSection_);
 				}
 			}
-			if ( NumLoopBar > 0 ) Just_.bar %= NumLoopBar;
 
-			isFormerHalf_ = ( numSamples % SamplesPerUnit ) < SamplesPerUnit / 2;
-			dtFromJust_ = (double)( numSamples % SamplesPerUnit ) / (double)SamplingRate;
+			just_.Subtract(CurrentSection_.StartTiming, CurrentSection_);
+			timeSecFromJust_ = (double)(sectionSample - just_.Bar * samplesPerBar_ - just_.Beat * samplesPerBeat_ - just_.Unit * samplesPerUnit_) / (double)samplingRate_;
+			isFormerHalf_ = (timeSecFromJust_ * samplingRate_) < samplesPerUnit_ / 2;
+			just_.Add(CurrentSection_.StartTiming, CurrentSection_);
 
-			Now_.Copy( Just_ );
-			if ( !isFormerHalf_ ) Now_.Increment();
-			if ( SamplesInLoop != 0 && numSamples + SamplesPerUnit/2 >= SamplesInLoop )
+			near_.Copy(just_);
+			if( !isFormerHalf_ ) near_.Increment(CurrentSection_);
+			if( samplesInLoop_ != 0 && currentSample_ + samplesPerUnit_/2 >= samplesInLoop_ )
 			{
-				Now_.Init();
+				near_.Init();
 			}
 
-			isNowChanged_ = Now_.totalUnit != OldNow.totalUnit;
-			isJustChanged_ = Just_.totalUnit != OldJust.totalUnit;
+			isNearChanged_ = (near_.Equals(oldNear_) == false);
+			isJustChanged_ = (just_.Equals(oldJust_) == false);
 
 			CallEvents();
 
-			OldNow.Copy( Now_ );
-			OldJust.Copy( Just_ );
-		}
-		else
-		{
-			//Debug.LogWarning( "Warning!! Failed to GetNumPlayedSamples" );
+			oldNear_.Copy(near_);
+			oldJust_.Copy(just_);
 		}
 
-		DebugUpdateText();
+		//DebugUpdateText();
 	}
 
+	/* DebugUpdateText
 	void DebugUpdateText()
 	{
-		if( debugText != null )
+		if( DebugText != null )
 		{
-			debugText.text = "Just = " + Just_.ToString() + ", MusicalTime = " + MusicalTime_;
-			if( sections.Count > 0 )
+			DebugText.text = "Just_ = " + Just_.ToString() + ", MusicalTime = " + MusicalTime_;
+			if( Sections.Count > 0 )
 			{
-				debugText.text += System.Environment.NewLine + "section[" + SectionIndex + "] = " + CurrentSection_.ToString();
+				DebugText.text += System.Environment.NewLine + "section[" + SectionIndex_ + "] = " + CurrentSection_.ToString();
 			}
 		}
 	}
-	#endregion
+	*/
 
-	#region Events
 	void CallEvents()
 	{
-		if ( isNowChanged_ ) OnNowChanged();
-		if ( isNowChanged_ && OldNow > Now_ )
-		{
-			WillRepeat();
-		}
-		if ( isJustChanged_ ) OnJustChanged();
-		if ( isJustChanged_ && Just_.unit == 0 ) OnBeat();
-		if ( isJustChanged_ && Just_.barUnit == 0 ) OnBar();
-		if ( isJustChanged_ && OldJust > Just_ )
+		if( isJustChanged_ ) OnJustChanged();
+		if( isJustChanged_ && just_.Unit == 0 ) OnBeat();
+		if( isJustChanged_ && just_.Unit == 0 && just_.Beat == 0 ) OnBar();
+		if( isJustChanged_ && oldJust_ > just_ )
 		{
 			OnRepeated();
 		}
-		
-		/*
-		if ( isJustChanged_ && Just_.totalUnit > 0 )
-		{
-			Timing tempOld = new Timing( OldJust );
-			tempOld.Increment();
-			if ( tempOld.totalUnit != Just_.totalUnit )
-			{
-				//This often happens when the frame rate is slow.
-				Debug.LogWarning( "Skipped some timing: OldJust = " + OldJust.ToString() + ", Just = " + Just_.ToString() );
-			}
-		}
-		*/
 	}
 
 	//On events (when isJustChanged)
-	void OnNowChanged()
-	{
-	}
-
 	void OnJustChanged()
 	{
-		foreach ( AudioSource cue in QuantizedCue )
+		foreach( AudioSource cue in quantizedCue_ )
 		{
 			cue.Play();
 		}
-		QuantizedCue.Clear();
+		quantizedCue_.Clear();
 	}
 
 	void OnBeat()
@@ -702,129 +696,96 @@ void OnRepeated()
 	{
 		++numRepeat_;
 	}
-
-	//Will events (when isNowChanged)
-	void WillRepeat()
-	{
-	}
 	#endregion
 }
 
 [Serializable]
 public class Timing : IComparable<Timing>, IEquatable<Timing>
 {
-	public Timing( int b = 0, int be = 0, int u = 0 )
+	public Timing(int bar = 0, int beat = 0, int unit = 0)
 	{
-		bar = b;
-		beat = be;
-		unit = u;
-		_cachedSectionIndex = 0;
+		Bar = bar;
+		Beat = beat;
+		Unit = unit;
 	}
 
-	public Timing( Timing copy )
+	public Timing(Timing copy)
 	{
-		Copy( copy );
+		Copy(copy);
 	}
 	public Timing() { this.Init(); }
-	public void Init() { bar = 0; beat = 0; unit = 0; _cachedSectionIndex = 0; }
-	public void Copy( Timing copy )
+	public void Init() { Bar = 0; Beat = 0; Unit = 0; }
+	public void Copy(Timing copy)
 	{
-		bar = copy.bar;
-		beat = copy.beat;
-		unit = copy.unit;
-		_cachedSectionIndex = copy._cachedSectionIndex;
+		Bar = copy.Bar;
+		Beat = copy.Beat;
+		Unit = copy.Unit;
 	}
 
-	public int bar, beat, unit;
+	public int Bar, Beat, Unit;
 
-	public int totalUnit
+	public int CurrentMusicalTime { get { return GetMusicalTime(Music.CurrentSection); } }
+	public int GetMusicalTime(Music.Section section)
 	{
-		get
-		{
-			return CurrentSection.StartTotalUnit_
-				+ ( bar  - CurrentSection.StartTiming_.bar )  * CurrentSection.mtBar_
-					+ ( beat - CurrentSection.StartTiming_.beat ) * CurrentSection.mtBeat_
-					+ ( unit - CurrentSection.StartTiming_.unit );
-		}
+		return Bar * section.UnitPerBar + Beat * section.UnitPerBeat + Unit;
 	}
-	public int barUnit { get { return ( unit < 0 ? CurrentSection.mtBar_ - unit : CurrentSection.mtBeat_ * beat + unit )%CurrentSection.mtBar_; } }
-	public void Increment()
+	public void Fix(Music.Section section)
 	{
-		unit++;
-		if ( CurrentSection.mtBeat_ * beat + unit >= CurrentSection.mtBar_ )
-		{
-			unit = 0;
-			beat = 0;
-			bar += 1;
-		}
-		else if ( unit >= CurrentSection.mtBeat_ )
-		{
-			unit = 0;
-			beat += 1;
-		}
+		int totalUnit = Bar * section.UnitPerBar + Beat * section.UnitPerBeat + Unit;
+		Bar = totalUnit / section.UnitPerBar;
+		Beat = (totalUnit - Bar*section.UnitPerBar) / section.UnitPerBeat;
+		Unit = (totalUnit - Bar*section.UnitPerBar - Beat * section.UnitPerBeat);
 	}
-	public void IncrementBeat()
+	public void Increment(Music.Section section)
 	{
-		beat++;
-		if ( CurrentSection.mtBeat_ * beat + unit >= CurrentSection.mtBar_ )
-		{
-			beat = 0;
-			bar += 1;
-		}
+		Unit++;
+		Fix(section);
 	}
-
-	int _cachedSectionIndex = 0;
-	int sectionIndex
+	public void Decrement(Music.Section section)
 	{
-		get
-		{
-			if( _cachedSectionIndex >= Music.SectionCount || 
-			   this < Music.GetSection(_cachedSectionIndex).StartTiming_ || 
-				( _cachedSectionIndex < Music.SectionCount-1 && Music.GetSection(_cachedSectionIndex+1).StartTiming_ <= this ) )
-			{
-				if( Music.GetSection(Music.SectionCount-1).StartTiming_ <= this )
-				{
-					_cachedSectionIndex = Music.SectionCount-1;
-				}
-				else
-				{
-					_cachedSectionIndex = 0;
-					for( int i=1; i<Music.SectionCount; i++ )
-					{
-						if( this < Music.GetSection(i).StartTiming_ )
-						{
-							_cachedSectionIndex = i - 1;
-							break;
-						}
-					}
-				}
-			}
-			return _cachedSectionIndex;
-		}
+		Unit--;
+		Fix(section);
+	}
+	public void IncrementBeat(Music.Section section)
+	{
+		Beat++;
+		Fix(section);
+	}
+	public void Add(Timing t, Music.Section section)
+	{
+		Bar += t.Bar;
+		Beat += t.Beat;
+		Unit += t.Unit;
+		Fix(section);
+	}
+	public void Subtract(Timing t, Music.Section section)
+	{
+		Bar -= t.Bar;
+		Beat -= t.Beat;
+		Unit -= t.Unit;
+		Fix(section);
 	}
-	Music.Section CurrentSection{ get{ return Music.GetSection(sectionIndex); } }
 
-	public static bool operator >( Timing t, Timing t2 ) { return t.bar > t2.bar || ( t.bar == t2.bar && t.beat > t2.beat ) || ( t.bar == t2.bar && t.beat == t2.beat && t.unit > t2.unit ) ; }
-	public static bool operator <( Timing t, Timing t2 ) { return !( t > t2 ) && !( t.Equals( t2 ) ); }
-	public static bool operator <=( Timing t, Timing t2 ) { return !( t > t2 ); }
-	public static bool operator >=( Timing t, Timing t2 ) { return t > t2 || t.Equals( t2 ); }
-	public static int operator -( Timing t, Timing t2 ) { return t.totalUnit - t2.totalUnit; }
+	public static bool operator >(Timing t, Timing t2) { return t.Bar > t2.Bar || (t.Bar == t2.Bar && t.Beat > t2.Beat) || (t.Bar == t2.Bar && t.Beat == t2.Beat && t.Unit > t2.Unit); }
+	public static bool operator <(Timing t, Timing t2) { return !(t > t2) && !(t.Equals(t2)); }
+	public static bool operator <=(Timing t, Timing t2) { return !(t > t2); }
+	public static bool operator >=(Timing t, Timing t2) { return t > t2 || t.Equals(t2); }
 
-	public override bool Equals( object obj )
+	public override bool Equals(object obj)
 	{
-		if ( object.ReferenceEquals( obj, null ) )
+		if( object.ReferenceEquals(obj, null) )
 		{
 			return false;
 		}
-		if ( object.ReferenceEquals( obj, this ) )
+		if( object.ReferenceEquals(obj, this) )
 		{
 			return true;
 		}
-		if ( this.GetType() != obj.GetType() )
+		if( this.GetType() != obj.GetType() )
 		{
 			return false;
 		}
-		return this.Equals( obj as Timing );
+		return this.Equals(obj as Timing);
 	}
 
 	public override int GetHashCode()
@@ -832,20 +793,20 @@ public override int GetHashCode()
 		return base.GetHashCode();
 	}
 
-	public bool Equals( Timing other )
+	public bool Equals(Timing other)
 	{
-		return ( this.bar == other.bar && this.beat == other.beat && this.unit == other.unit );
+		return (this.Bar == other.Bar && this.Beat == other.Beat && this.Unit == other.Unit);
 	}
 
-	public int CompareTo( Timing tother )
+	public int CompareTo(Timing tother)
 	{
-		if ( this.Equals( tother ) ) return 0;
-		else if ( this > tother ) return 1;
+		if( this.Equals(tother) ) return 0;
+		else if( this > tother ) return 1;
 		else return -1;
 	}
 
 	public override string ToString()
 	{
-		return bar + " " + beat + " " + unit;
+		return Bar + " " + Beat + " " + Unit;
 	}
 }
\ No newline at end of file
diff --git a/Example/MusicPong/Assets/MusicPong.unity b/Example/MusicPong/Assets/MusicPong.unity
index ed458de..5654c4d 100644
Binary files a/Example/MusicPong/Assets/MusicPong.unity and b/Example/MusicPong/Assets/MusicPong.unity differ
diff --git a/Example/MusicPong/Assets/Paddle.cs b/Example/MusicPong/Assets/Paddle.cs
index 764d314..a0dc266 100644
--- a/Example/MusicPong/Assets/Paddle.cs
+++ b/Example/MusicPong/Assets/Paddle.cs
@@ -13,6 +13,7 @@ public class Paddle : MonoBehaviour {
     Vector3 initialScale, initialPosition;
 
     int damageMusicalTime;
+	float reflectTime = 0;
 
 
 	// Use this for initialization
@@ -26,11 +27,11 @@ public class Paddle : MonoBehaviour {
 	// Update is called once per frame
     void Update()
     {
-        if( Music.CurrentSection.name == "Start" )
+        if( Music.CurrentSection.Name == "Start" )
         {
             transform.localScale = new Vector3( initialScale.x * Mathf.Clamp01( (float)Music.MusicalTime / 16.0f ), initialScale.y, initialScale.z );
         }
-        else if( Music.CurrentSection.name.StartsWith( "Play" ) )
+		else if( Music.CurrentSection.Name.StartsWith("Play") )
         {
             //input
             Ray ray = MainCamera.ScreenPointToRay( Input.mousePosition );
@@ -38,7 +39,7 @@ void Update()
             Physics.Raycast( ray.origin, ray.direction, out hit, Mathf.Infinity );
             if( hit.collider != null )
             {
-                transform.position = new Vector3( Mathf.Clamp( hit.point.x, -Field.FieldLength + Field.BarRadius, Field.FieldLength - Field.BarRadius ), transform.position.y, 0 );
+				transform.position = new Vector3(Mathf.Clamp(hit.point.x, -Field.FieldLength + Field.BarRadius, Field.FieldLength - Field.BarRadius), initialPosition.y - reflectTime * 0.6f, 0);
             }
 
             //reflect
@@ -48,21 +49,39 @@ void Update()
             {
                 ball.velocity = Vector3.Reflect( ball.velocity, Quaternion.AngleAxis( -curve * d.x / Field.BarRadius, Vector3.forward ) * Vector3.up );
                 ball.velocity.y = Mathf.Max( ball.velocity.y, 2.5f );
-                Music.QuantizePlay( audio, -3 );
+                Music.QuantizePlay( GetComponent<AudioSource>(), -3 );
+				reflectTime = ball.velocity.magnitude * 0.025f;
             }
+			if( reflectTime > 0 )
+			{
+				reflectTime -= Time.deltaTime;
+				if( reflectTime < 0 ) reflectTime = 0;
+			}
 
             //damage
             if( damageMusicalTime > 0 )
             {
-                redBar.renderer.material.color = Music.isFormerHalf ? Color.red : Color.white;
-                if( Music.isJustChanged )
+                redBar.GetComponent<Renderer>().material.color = Music.IsFormerHalf ? Color.red : Color.white;
+                if( Music.IsJustChanged )
                 {
                     --damageMusicalTime;
                     if( damageMusicalTime <= 0 )
                     {
                         redBar.transform.localScale = Vector3.one;
                     }
-                }
+				}
+				if( Music.IsJustChanged || Music.IsNearChanged )
+				{
+					if( damageMusicalTime > 4 )
+					{
+						Vector2 randCircle = Random.insideUnitCircle * 0.03f * (damageMusicalTime -4);
+						Camera.main.transform.position = new Vector3(randCircle.x, randCircle.y, -10);
+					}
+					else
+					{
+						Camera.main.transform.position = new Vector3(0, 0, -10);
+					}
+				}
             }
         }
 	}
diff --git a/Example/MusicPong/Assets/WhiteMaterial.mat b/Example/MusicPong/Assets/WhiteMaterial.mat
index 672aec9..6078068 100644
Binary files a/Example/MusicPong/Assets/WhiteMaterial.mat and b/Example/MusicPong/Assets/WhiteMaterial.mat differ
diff --git a/Example/MusicPong/Library/AnnotationManager b/Example/MusicPong/Library/AnnotationManager
deleted file mode 100644
index 9c049b7..0000000
Binary files a/Example/MusicPong/Library/AnnotationManager and /dev/null differ
diff --git a/Example/MusicPong/Library/AssetImportState b/Example/MusicPong/Library/AssetImportState
deleted file mode 100644
index cfb43ea..0000000
--- a/Example/MusicPong/Library/AssetImportState
+++ /dev/null
@@ -1 +0,0 @@
-5;0;-1
\ No newline at end of file
diff --git a/Example/MusicPong/Library/AssetServerCacheV3 b/Example/MusicPong/Library/AssetServerCacheV3
deleted file mode 100644
index 5b533a0..0000000
Binary files a/Example/MusicPong/Library/AssetServerCacheV3 and /dev/null differ
diff --git a/Example/MusicPong/Library/AssetVersioning.db b/Example/MusicPong/Library/AssetVersioning.db
deleted file mode 100644
index 7c4c8d3..0000000
Binary files a/Example/MusicPong/Library/AssetVersioning.db and /dev/null differ
diff --git a/Example/MusicPong/Library/BuildPlayer.prefs b/Example/MusicPong/Library/BuildPlayer.prefs
deleted file mode 100644
index e69de29..0000000
diff --git a/Example/MusicPong/Library/BuildSettings.asset b/Example/MusicPong/Library/BuildSettings.asset
deleted file mode 100644
index c5064da..0000000
Binary files a/Example/MusicPong/Library/BuildSettings.asset and /dev/null differ
diff --git a/Example/MusicPong/Library/CurrentLayout.dwlt b/Example/MusicPong/Library/CurrentLayout.dwlt
deleted file mode 100644
index d63f7b6..0000000
Binary files a/Example/MusicPong/Library/CurrentLayout.dwlt and /dev/null differ
diff --git a/Example/MusicPong/Library/EditorUserBuildSettings.asset b/Example/MusicPong/Library/EditorUserBuildSettings.asset
deleted file mode 100644
index 2e02559..0000000
Binary files a/Example/MusicPong/Library/EditorUserBuildSettings.asset and /dev/null differ
diff --git a/Example/MusicPong/Library/EditorUserSettings.asset b/Example/MusicPong/Library/EditorUserSettings.asset
deleted file mode 100644
index 3e0dfe6..0000000
Binary files a/Example/MusicPong/Library/EditorUserSettings.asset and /dev/null differ
diff --git a/Example/MusicPong/Library/FailedAssetImports.txt b/Example/MusicPong/Library/FailedAssetImports.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/Example/MusicPong/Library/InspectorExpandedItems.asset b/Example/MusicPong/Library/InspectorExpandedItems.asset
deleted file mode 100644
index 675553e..0000000
Binary files a/Example/MusicPong/Library/InspectorExpandedItems.asset and /dev/null differ
diff --git a/Example/MusicPong/Library/MonoManager.asset b/Example/MusicPong/Library/MonoManager.asset
deleted file mode 100644
index 31fe9cf..0000000
Binary files a/Example/MusicPong/Library/MonoManager.asset and /dev/null differ
diff --git a/Example/MusicPong/Library/ProjectSettings.asset b/Example/MusicPong/Library/ProjectSettings.asset
deleted file mode 100644
index 5cc84d6..0000000
Binary files a/Example/MusicPong/Library/ProjectSettings.asset and /dev/null differ
diff --git a/Example/MusicPong/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Example/MusicPong/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
deleted file mode 100644
index da43207..0000000
Binary files a/Example/MusicPong/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and /dev/null differ
diff --git a/Example/MusicPong/Library/ScriptAssemblies/CompilationCompleted.txt b/Example/MusicPong/Library/ScriptAssemblies/CompilationCompleted.txt
deleted file mode 100644
index d25ad0d..0000000
--- a/Example/MusicPong/Library/ScriptAssemblies/CompilationCompleted.txt
+++ /dev/null
@@ -1 +0,0 @@
-Completed
diff --git a/Example/MusicPong/Library/ScriptMapper b/Example/MusicPong/Library/ScriptMapper
deleted file mode 100644
index 9db64b7..0000000
Binary files a/Example/MusicPong/Library/ScriptMapper and /dev/null differ
diff --git a/Example/MusicPong/Library/assetDatabase3 b/Example/MusicPong/Library/assetDatabase3
deleted file mode 100644
index 94410f2..0000000
Binary files a/Example/MusicPong/Library/assetDatabase3 and /dev/null differ
diff --git a/Example/MusicPong/Library/expandedItems b/Example/MusicPong/Library/expandedItems
deleted file mode 100644
index 0e4274f..0000000
Binary files a/Example/MusicPong/Library/expandedItems and /dev/null differ
diff --git a/Example/MusicPong/Library/guidmapper b/Example/MusicPong/Library/guidmapper
deleted file mode 100644
index a6dc86e..0000000
Binary files a/Example/MusicPong/Library/guidmapper and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/00000000000000001000000000000000 b/Example/MusicPong/Library/metadata/00/00000000000000001000000000000000
deleted file mode 100644
index bdcfd58..0000000
Binary files a/Example/MusicPong/Library/metadata/00/00000000000000001000000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/00000000000000002000000000000000 b/Example/MusicPong/Library/metadata/00/00000000000000002000000000000000
deleted file mode 100644
index 4eb2140..0000000
Binary files a/Example/MusicPong/Library/metadata/00/00000000000000002000000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/00000000000000003000000000000000 b/Example/MusicPong/Library/metadata/00/00000000000000003000000000000000
deleted file mode 100644
index 30066ed..0000000
Binary files a/Example/MusicPong/Library/metadata/00/00000000000000003000000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/00000000000000004000000000000000 b/Example/MusicPong/Library/metadata/00/00000000000000004000000000000000
deleted file mode 100644
index ae42652..0000000
Binary files a/Example/MusicPong/Library/metadata/00/00000000000000004000000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/00000000000000004100000000000000 b/Example/MusicPong/Library/metadata/00/00000000000000004100000000000000
deleted file mode 100644
index 131ce0c..0000000
Binary files a/Example/MusicPong/Library/metadata/00/00000000000000004100000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/00000000000000005000000000000000 b/Example/MusicPong/Library/metadata/00/00000000000000005000000000000000
deleted file mode 100644
index 86d7515..0000000
Binary files a/Example/MusicPong/Library/metadata/00/00000000000000005000000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/00000000000000005100000000000000 b/Example/MusicPong/Library/metadata/00/00000000000000005100000000000000
deleted file mode 100644
index ca52640..0000000
Binary files a/Example/MusicPong/Library/metadata/00/00000000000000005100000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/00000000000000006000000000000000 b/Example/MusicPong/Library/metadata/00/00000000000000006000000000000000
deleted file mode 100644
index f23f329..0000000
Binary files a/Example/MusicPong/Library/metadata/00/00000000000000006000000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/00000000000000006100000000000000 b/Example/MusicPong/Library/metadata/00/00000000000000006100000000000000
deleted file mode 100644
index b83ea58..0000000
Binary files a/Example/MusicPong/Library/metadata/00/00000000000000006100000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/00000000000000007000000000000000 b/Example/MusicPong/Library/metadata/00/00000000000000007000000000000000
deleted file mode 100644
index b68c39a..0000000
Binary files a/Example/MusicPong/Library/metadata/00/00000000000000007000000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/00000000000000008000000000000000 b/Example/MusicPong/Library/metadata/00/00000000000000008000000000000000
deleted file mode 100644
index f9f7ebc..0000000
Binary files a/Example/MusicPong/Library/metadata/00/00000000000000008000000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/00000000000000009000000000000000 b/Example/MusicPong/Library/metadata/00/00000000000000009000000000000000
deleted file mode 100644
index 6038b8b..0000000
Binary files a/Example/MusicPong/Library/metadata/00/00000000000000009000000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/0000000000000000a000000000000000 b/Example/MusicPong/Library/metadata/00/0000000000000000a000000000000000
deleted file mode 100644
index 7feb058..0000000
Binary files a/Example/MusicPong/Library/metadata/00/0000000000000000a000000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/0000000000000000b000000000000000 b/Example/MusicPong/Library/metadata/00/0000000000000000b000000000000000
deleted file mode 100644
index 7997452..0000000
Binary files a/Example/MusicPong/Library/metadata/00/0000000000000000b000000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/00/0000000000000000c000000000000000 b/Example/MusicPong/Library/metadata/00/0000000000000000c000000000000000
deleted file mode 100644
index 6a6ffe3..0000000
Binary files a/Example/MusicPong/Library/metadata/00/0000000000000000c000000000000000 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/0c/0c86c10b13c2c1f4f998ce5540ffcbb0 b/Example/MusicPong/Library/metadata/0c/0c86c10b13c2c1f4f998ce5540ffcbb0
deleted file mode 100644
index 94a2d62..0000000
Binary files a/Example/MusicPong/Library/metadata/0c/0c86c10b13c2c1f4f998ce5540ffcbb0 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/0f/0f17a86521a26424e8198c20fe3cf41f b/Example/MusicPong/Library/metadata/0f/0f17a86521a26424e8198c20fe3cf41f
deleted file mode 100644
index d8a82f8..0000000
Binary files a/Example/MusicPong/Library/metadata/0f/0f17a86521a26424e8198c20fe3cf41f and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/2f/2f2ec1197f8514f4b964a1ef9d40acd8 b/Example/MusicPong/Library/metadata/2f/2f2ec1197f8514f4b964a1ef9d40acd8
deleted file mode 100644
index 2208a55..0000000
Binary files a/Example/MusicPong/Library/metadata/2f/2f2ec1197f8514f4b964a1ef9d40acd8 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/30/30e80fa6799ab964d86c18c8e4eea22d b/Example/MusicPong/Library/metadata/30/30e80fa6799ab964d86c18c8e4eea22d
deleted file mode 100644
index 5943aa9..0000000
Binary files a/Example/MusicPong/Library/metadata/30/30e80fa6799ab964d86c18c8e4eea22d and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/36/363da4b2d778ea344a4193b3988a7c43 b/Example/MusicPong/Library/metadata/36/363da4b2d778ea344a4193b3988a7c43
deleted file mode 100644
index 5c13525..0000000
Binary files a/Example/MusicPong/Library/metadata/36/363da4b2d778ea344a4193b3988a7c43 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/3f/3f0290d19445a2547a47005c17582ba4 b/Example/MusicPong/Library/metadata/3f/3f0290d19445a2547a47005c17582ba4
deleted file mode 100644
index bdaa73c..0000000
Binary files a/Example/MusicPong/Library/metadata/3f/3f0290d19445a2547a47005c17582ba4 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/57/57c16c0452ce88d48b13025b797be8c3 b/Example/MusicPong/Library/metadata/57/57c16c0452ce88d48b13025b797be8c3
deleted file mode 100644
index 7b9b7ba..0000000
Binary files a/Example/MusicPong/Library/metadata/57/57c16c0452ce88d48b13025b797be8c3 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/63/63d6100a56281aa4fac6bdbe415d9817 b/Example/MusicPong/Library/metadata/63/63d6100a56281aa4fac6bdbe415d9817
deleted file mode 100644
index 6c868e6..0000000
Binary files a/Example/MusicPong/Library/metadata/63/63d6100a56281aa4fac6bdbe415d9817 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/9e/9e6a51a83bba4fc4eab076baaf6f3024 b/Example/MusicPong/Library/metadata/9e/9e6a51a83bba4fc4eab076baaf6f3024
deleted file mode 100644
index 464ef2c..0000000
Binary files a/Example/MusicPong/Library/metadata/9e/9e6a51a83bba4fc4eab076baaf6f3024 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/9e/9e8bf9e8410cecb45b77cd86a84df56b b/Example/MusicPong/Library/metadata/9e/9e8bf9e8410cecb45b77cd86a84df56b
deleted file mode 100644
index 0bc1289..0000000
Binary files a/Example/MusicPong/Library/metadata/9e/9e8bf9e8410cecb45b77cd86a84df56b and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/a3/a323b41ccc85aa44e857a074e34fcee7 b/Example/MusicPong/Library/metadata/a3/a323b41ccc85aa44e857a074e34fcee7
deleted file mode 100644
index f0b7248..0000000
Binary files a/Example/MusicPong/Library/metadata/a3/a323b41ccc85aa44e857a074e34fcee7 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/aa/aaa127bc355367247acaea0961de3569 b/Example/MusicPong/Library/metadata/aa/aaa127bc355367247acaea0961de3569
deleted file mode 100644
index 4408e43..0000000
Binary files a/Example/MusicPong/Library/metadata/aa/aaa127bc355367247acaea0961de3569 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/b5/b51180f5f1dcacb48b44d876264bc6e8 b/Example/MusicPong/Library/metadata/b5/b51180f5f1dcacb48b44d876264bc6e8
deleted file mode 100644
index 79114ee..0000000
Binary files a/Example/MusicPong/Library/metadata/b5/b51180f5f1dcacb48b44d876264bc6e8 and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/b8/b8330b0f8daa9e449b72420594c94e4f b/Example/MusicPong/Library/metadata/b8/b8330b0f8daa9e449b72420594c94e4f
deleted file mode 100644
index 7943879..0000000
Binary files a/Example/MusicPong/Library/metadata/b8/b8330b0f8daa9e449b72420594c94e4f and /dev/null differ
diff --git a/Example/MusicPong/Library/metadata/cf/cf93e68ec3011b949952e59323f0090a b/Example/MusicPong/Library/metadata/cf/cf93e68ec3011b949952e59323f0090a
deleted file mode 100644
index e288cbc..0000000
Binary files a/Example/MusicPong/Library/metadata/cf/cf93e68ec3011b949952e59323f0090a and /dev/null differ
diff --git a/Example/MusicPong/MusicPong-csharp.sln b/Example/MusicPong/MusicPong-csharp.sln
index 349b761..b2d48df 100644
--- a/Example/MusicPong/MusicPong-csharp.sln
+++ b/Example/MusicPong/MusicPong-csharp.sln
@@ -17,7 +17,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																												GlobalSection(MonoDevelopProperties) = preSolution
+																																							GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1
diff --git a/Example/MusicPong/MusicPong.sln b/Example/MusicPong/MusicPong.sln
index 54588f3..4a85dae 100644
--- a/Example/MusicPong/MusicPong.sln
+++ b/Example/MusicPong/MusicPong.sln
@@ -17,7 +17,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																											GlobalSection(MonoDevelopProperties) = preSolution
+																																						GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1
diff --git a/Example/MusicPong/ProjectSettings/GraphicsSettings.asset b/Example/MusicPong/ProjectSettings/GraphicsSettings.asset
index 91be959..d75e792 100644
Binary files a/Example/MusicPong/ProjectSettings/GraphicsSettings.asset and b/Example/MusicPong/ProjectSettings/GraphicsSettings.asset differ
diff --git a/Example/MusicPong/ProjectSettings/NavMeshAreas.asset b/Example/MusicPong/ProjectSettings/NavMeshAreas.asset
new file mode 100644
index 0000000..a69113f
Binary files /dev/null and b/Example/MusicPong/ProjectSettings/NavMeshAreas.asset differ
diff --git a/Example/MusicPong/ProjectSettings/ProjectSettings.asset b/Example/MusicPong/ProjectSettings/ProjectSettings.asset
index 5cc84d6..9dc6017 100644
Binary files a/Example/MusicPong/ProjectSettings/ProjectSettings.asset and b/Example/MusicPong/ProjectSettings/ProjectSettings.asset differ
diff --git a/Example/MusicPong/ProjectSettings/ProjectVersion.txt b/Example/MusicPong/ProjectSettings/ProjectVersion.txt
new file mode 100644
index 0000000..b0ac510
--- /dev/null
+++ b/Example/MusicPong/ProjectSettings/ProjectVersion.txt
@@ -0,0 +1,2 @@
+m_EditorVersion: 5.0.0f4
+m_StandardAssetsVersion: 0
diff --git a/Music.cs b/Music.cs
index 9411263..bfc5db9 100644
--- a/Music.cs
+++ b/Music.cs
@@ -9,243 +9,269 @@
 using System.Collections.Generic;
 
 [ExecuteInEditMode]
+[RequireComponent(typeof(AudioSource))]
 public class Music : MonoBehaviour
 {
-	//editor params
-	public List<Section> sections;
-	//indexer
+	#region Section class
+	[Serializable]
+	public class Section
+	{
+		public string Name;
+		public int UnitPerBeat;
+		public int UnitPerBar;
+		public double Tempo;
+		public Timing StartTiming;
+		public int StartTimeSamples;
+
+		public Section(Timing startTiming, int mtBeat = 4, int mtBar = 16, double tempo = 120)
+		{
+			StartTiming = startTiming;
+			UnitPerBeat = mtBeat;
+			UnitPerBar = mtBar;
+			Tempo = tempo;
+		}
+
+		public void OnValidate(int startTimeSample)
+		{
+			StartTimeSamples = startTimeSample;
+		}
+
+		public override string ToString()
+		{
+			return string.Format("\"{0}\" startTiming:{1}, Tempo:{2}", Name, StartTiming.ToString(), Tempo);
+		}
+	}
+
 	public Section this[int index]
 	{
 		get
 		{
 			if( 0 <= index && index < SectionCount_ )
 			{
-				return sections[index];
+				return Sections[index];
 			}
 			else
 			{
-				Debug.LogWarning( "Section index out of range! index = " + index + ", SectionCount = " + SectionCount_ );
+				Debug.LogWarning("Section index out of range! index = " + index + ", SectionCount = " + SectionCount_);
 				return null;
 			}
 		}
 	}
+	#endregion
+
+	static Music Current_;
+	static List<Music> MusicList_ = new List<Music>();
+
+	#region editor params
+	public List<Section> Sections;
 
 	/// <summary>
 	/// Just for music that doesn't start with the first timesample.
 	/// if so, specify time samples before music goes into first timing = (0,0,0).
 	/// </summary>
-	public int delayTimeSamples = 0;
+	public int EntryPointSample = 0;
+
 	/// <summary>
 	/// put your debug GUIText to see current musical time & section info.
 	/// </summary>
-	public GUIText debugText;
-
-	[Serializable]
-	public class Section
-	{
-		public string name;
-		/// <summary>
-		/// how many MusicTime in a beat. maybe 4 or 3.
-		/// </summary>
-		public int mtBeat_;
-		/// <summary>
-		/// how many MusicTime in a bar.
-		/// </summary>
-		public int mtBar_;
-		/// <summary>
-		/// Musical Tempo. how many beats in a minutes.
-		/// </summary>
-		public double Tempo_;
-
-		public Timing StartTiming_;
-
-		public int StartTimeSamples_;
-		public int StartTotalUnit_ { get; private set; }
-		public bool isValidated_ { get; private set; }
-
-		public Section( Timing startTiming, int mtBeat = 4, int mtBar = 16, double Tempo = 120 )
-		{
-			StartTiming_ = startTiming;
-			mtBeat_ = mtBeat;
-			mtBar_ = mtBar;
-			Tempo_ = Tempo;
-		}
-
-		public void OnValidate( int startTimeSample, int startTotalUnit )
-		{
-			StartTimeSamples_ = startTimeSample;
-			StartTotalUnit_ = startTotalUnit;
-			isValidated_ = true;
-		}
-
-		public override string ToString()
-		{
-			return string.Format( "\"{0}\" startTiming:{1}, Tempo:{2}", name, StartTiming_.ToString(), Tempo_ );
-		}
-	}
-
-	public class SoundCue
-	{
-		public SoundCue( AudioSource source ) { this.source = source; }
-		public AudioSource source { get; private set; }
-
-		public void Play()
-		{
-			source.Play();
-		}
-		public void Stop()
-		{
-			source.Stop();
-		}
-		public void Pause()
-		{
-			source.Pause();
-		}
-		public bool IsPlaying()
-		{
-			return source.isPlaying;
-		}
-		public long GetTimeSamples()
-		{
-			return source.timeSamples;
-		}
-		public float GetTime()
-		{
-			return source.time;
-		}
-		public void SetVolume( float volume )
-		{
-			source.volume = volume;
-		}
-	}
+	//public GUIText DebugText;
+	#endregion
 
-	static Music Current;
-	static List<Music> MusicList = new List<Music>();
-	
 	#region public static properties
+	public static bool IsPlaying { get { return Current_.IsPlaying_; } }
 	/// <summary>
-	/// means last timing.
+	/// last timing.
 	/// </summary>
-	public static Timing Just { get { return Current.Just_; } }
+	public static Timing Just { get { return Current_.Just_; } }
 	/// <summary>
-	/// means nearest timing.
+	/// nearest timing.
 	/// </summary>
-	public static Timing Now { get { return Current.Now_; } }
+	public static Timing Near { get { return Current_.Near_; } }
 	/// <summary>
 	/// is Just changed in this frame or not.
 	/// </summary>
-	public static bool isJustChanged { get { return Current.isJustChanged_; } }
+	public static bool IsJustChanged { get { return Current_.IsJustChanged_; } }
 	/// <summary>
-	/// is Now changed in this frame or not.
+	/// is Near changed in this frame or not.
 	/// </summary>
-	public static bool isNowChanged { get { return Current.isNowChanged_; } }
+	public static bool IsNearChanged { get { return Current_.IsNearChanged_; } }
 	/// <summary>
 	/// is currently former half in a MusicTimeUnit, or last half.
 	/// </summary>
-	public static bool isFormerHalf { get { return Current.isFormerHalf_; } }
+	public static bool IsFormerHalf { get { return Current_.IsFormerHalf_; } }
 	/// <summary>
 	/// delta time from JustChanged.
 	/// </summary>
-	public static double dtFromJust { get { return Current.dtFromJust_; } }
+	public static double TimeSecFromJust { get { return Current_.TimeSecFromJust_; } }
 	/// <summary>
 	/// how many times you repeat current music/block.
 	/// </summary>
-	public static int numRepeat { get { return Current.numRepeat_; } }
+	public static int NumRepeat { get { return Current_.NumRepeat_; } }
 	/// <summary>
 	/// returns how long from nearest Just timing with sign.
 	/// </summary>
-	public static double lag{ get{ return Current.lag_; } }
+	public static double Lag { get { return Current_.Lag_; } }
 	/// <summary>
 	/// returns how long from nearest Just timing absolutely.
 	/// </summary>
-	public static double lagAbs{ get{ return Current.lagAbs_; } }
+	public static double LagAbs { get { return Current_.LagAbs_; } }
 	/// <summary>
 	/// returns normalized lag.
 	/// </summary>
-	public static double lagUnit{ get{ return Current.lagUnit_; } }
-
-	public static double MusicalTime { get { return Current.MusicalTime_; } }   //sec per MusicTimeUnit
-	public static float AudioTime { get{ return Current.AudioTime_; } }		 //sec
-	public static long TimeSamples { get{ return Current.TimeSamples_; } }	  //sample
-
-	public static int mtBar { get { return Current.mtBar_; } }
-	public static int mtBeat { get { return Current.mtBeat_; } }
-	public static double MusicTimeUnit { get { return Current.MusicTimeUnit_; } }
-
-	public static string CurrentMusicName { get { return Current.name; } }
-	public static SoundCue CurrentSource { get { return Current.MusicSource; } }
+	public static double LagUnit { get { return Current_.LagUnit_; } }
+	/// <summary>
+	/// sec / musicalUnit
+	/// </summary>
+	public static double MusicTimeUnit { get { return Current_.MusicTimeUnit_; } }
+	/// <summary>
+	/// current musical time based on MusicalTimeUnit
+	/// **warning** if CurrentSection.UnitPerBar changed, this is not continuous.
+	/// </summary>
+	public static float MusicalTime { get { return Current_.MusicalTime_; } }
+	/// <summary>
+	/// current musical time based on MusicalBar.
+	/// This is always continuous(MusicalTime is not).
+	/// </summary>
+	public static float MusicalTimeBar { get { return Current_.MusicalTimeBar_; } }
+	/// <summary>
+	/// dif from timing to Just on musical time unit.
+	/// </summary>
+	/// <param name="timing"></param>
+	/// <returns></returns>
+	public static float MusicalTimeFrom(Timing timing)
+	{
+		Section section = null;
+		int index = 0;
+		for( int i=0; i<SectionCount; ++i )
+		{
+			if( i + 1 < SectionCount )
+			{
+				if( timing < Current_[i+1].StartTiming )
+				{
+					index = i;
+					break;
+				}
+			}
+			else
+			{
+				index = i;
+			}
+		}
+		section = Current_[index];
+		int startIndex = Mathf.Min(index, Current_.SectionIndex_);
+		int endIndex = Mathf.Max(index, Current_.SectionIndex_);
+		Timing currentTiming = new Timing(timing < Just ? timing : Just);
+		Timing endTiming = (timing > Just ? timing : Just);
+		int musicalTime = 0;
+		for( int i=startIndex; i<=endIndex; ++i )
+		{
+			if( i < endIndex )
+			{
+				musicalTime += Current_[i+1].StartTiming.GetMusicalTime(Current_[i]) - currentTiming.GetMusicalTime(Current_[i]);
+				currentTiming.Copy(Current_[i+1].StartTiming);
+			}
+			else
+			{
+				musicalTime += endTiming.GetMusicalTime(Current_[i]) - currentTiming.GetMusicalTime(Current_[i]);
+			}
+		}
+		return (float)((timing > Just ? -1 : 1) * musicalTime + TimeSecFromJust / MusicTimeUnit);
+	}
+	/// <summary>
+	/// current audio play time in sec.
+	/// </summary>
+	public static float AudioTimeSec { get { return Current_.AudioTimeSec_; } }
+	/// <summary>
+	/// current audio play sample
+	/// </summary>
+	public static int TimeSamples { get { return Current_.TimeSamples_; } }
+	/// <summary>
+	/// returns musically synced cos wave.
+	/// if default( MusicalCos(16,0,0,1),
+	/// starts from max=1,
+	/// reaches min=0 on MusicalTime = cycle/2 = 8,
+	/// back to max=1 on MusicalTIme = cycle = 16.
+	/// </summary>
+	/// <param name="cycle">wave cycle in musical unit</param>
+	/// <param name="offset">wave offset in musical unit</param>
+	/// <param name="min"></param>
+	/// <param name="max"></param>
+	/// <returns></returns>
+	public static float MusicalCos(float cycle = 16, float offset = 0, float min = 0, float max = 1)
+	{
+		return Mathf.Lerp(min, max, ((float)Math.Cos(Math.PI * 2 * (MusicalTime + offset) / cycle) + 1.0f)/2.0f);
+	}
 
-	public static Section CurrentSection { get { return Current.CurrentSection_; } }
-	public static int SectionCount { get { return Current.SectionCount_; } }
+	public static int UnitPerBar { get { return Current_.UnitPerBar_; } }
+	public static int UnitPerBeat { get { return Current_.UnitPerBeat_; } }
+	public static AudioSource CurrentSource { get { return Current_.MusicSource_; } }
+	public static Section CurrentSection { get { return Current_.CurrentSection_; } }
+	public static int SectionCount { get { return Current_.SectionCount_; } }
+	public static string CurrentMusicName { get { return Current_.name; } }
+	public static Section GetSection(int index)
+	{
+		return Current_[index];
+	}
+	public static Section GetSection(string name)
+	{
+		return Current_.Sections.Find((Section s) => s.Name == name);
+	}
 	#endregion
 
 	#region public static predicates
-	public static bool IsJustChangedWhen( System.Predicate<Timing> pred )
+	public static bool IsJustChangedWhen(System.Predicate<Timing> pred)
 	{
-		return Current.IsJustChangedWhen_( pred );
+		return Current_.IsJustChangedWhen_(pred);
 	}
 	public static bool IsJustChangedBar()
 	{
-		return Current.IsJustChangedBar_();
+		return Current_.IsJustChangedBar_();
 	}
 	public static bool IsJustChangedBeat()
 	{
-		return Current.IsJustChangedBeat_();
+		return Current_.IsJustChangedBeat_();
 	}
-	public static bool IsJustChangedAt( int bar = 0, int beat = 0, int unit = 0 )
+	public static bool IsJustChangedAt(int bar = 0, int beat = 0, int unit = 0)
 	{
-		return Current.IsJustChangedAt_( bar, beat, unit );
+		return Current_.IsJustChangedAt_(bar, beat, unit);
 	}
-	public static bool IsJustChangedAt( Timing t )
+	public static bool IsJustChangedAt(Timing t)
 	{
-		return Current.IsJustChangedAt_( t.bar, t.beat, t.unit );
+		return Current_.IsJustChangedAt_(t.Bar, t.Beat, t.Unit);
 	}
-	public static bool IsJustChangedSection( string sectionName = "" )
+	public static bool IsJustChangedSection(string sectionName = "")
 	{
-		Section targetSection = (sectionName == "" ? CurrentSection : GetSection( sectionName ));
+		Section targetSection = (sectionName == "" ? CurrentSection : GetSection(sectionName));
 		if( targetSection != null )
 		{
-			return IsJustChangedAt( targetSection.StartTiming_ );
+			return IsJustChangedAt(targetSection.StartTiming);
 		}
 		else
 		{
-			Debug.LogWarning( "Can't find section name: " + sectionName );
+			Debug.LogWarning("Can't find section name: " + sectionName);
 			return false;
 		}
 	}
 
-	public static bool IsNowChangedWhen( System.Predicate<Timing> pred )
-	{
-		return Current.IsNowChangedWhen_(pred);
-	}
-	public static bool IsNowChangedBar()
-	{
-		return Current.IsNowChangedBar_();
-	}
-	public static bool IsNowChangedBeat()
-	{
-		return Current.IsNowChangedBeat_();
-	}
-	public static bool IsNowChangedAt( int bar, int beat = 0, int unit = 0 )
+	public static bool IsNearChangedWhen(System.Predicate<Timing> pred)
 	{
-		return Current.IsNowChangedAt_(bar,beat,unit);
+		return Current_.IsNearChangedWhen_(pred);
 	}
-	public static bool IsNowChangedAt( Timing t )
+	public static bool IsNearChangedBar()
 	{
-		return Current.IsNowChangedAt_( t.bar, t.beat, t.unit );
+		return Current_.IsNearChangedBar_();
 	}
-
-	public static Section GetSection( int index )
+	public static bool IsNearChangedBeat()
 	{
-		return Current[index];
+		return Current_.IsNearChangedBeat_();
 	}
-	public static Section GetSection( string name )
+	public static bool IsNearChangedAt(int bar, int beat = 0, int unit = 0)
 	{
-		return Current.sections.Find( ( Section s ) => s.name == name );
+		return Current_.IsNearChangedAt_(bar, beat, unit);
 	}
-	public static float MusicalTimeFrom( Timing timing )
+	public static bool IsNearChangedAt(Timing t)
 	{
-		return (Now - timing) + (float)lagUnit;
+		return Current_.IsNearChangedAt_(t.Bar, t.Beat, t.Unit);
 	}
 	#endregion
 
@@ -254,148 +280,162 @@ public static float MusicalTimeFrom( Timing timing )
 	/// Change Current Music.
 	/// </summary>
 	/// <param name="MusicName">name of the GameObject that include Music</param>
-	public static void Play( string MusicName ) { MusicList.Find( ( Music m ) => m.name == MusicName ).PlayStart(); }
+	public static void Play(string MusicName) { MusicList_.Find((Music m) => m.name == MusicName).PlayStart(); }
 	/// <summary>
 	/// Quantize to musical time.
 	/// </summary>
-	public static void QuantizePlay( AudioSource source, int transpose = 0 )
+	public static void QuantizePlay(AudioSource source, int transpose = 0, float allowRange = 0.3f)
 	{
-		source.pitch = Mathf.Pow( pitchUnit, transpose );
-		if( isFormerHalf && lagUnit < 0.3f )
+		source.pitch = Mathf.Pow(PITCH_UNIT, transpose);
+		if( IsFormerHalf && LagUnit < allowRange )
 		{
 			source.Play();
 		}
 		else
 		{
-			Current.QuantizedCue.Add( source );
+			Current_.QuantizedCue_.Add(source);
 		}
 	}
-	public static bool IsPlaying() { return Current.MusicSource.IsPlaying(); }
-	public static void Pause() { Current.MusicSource.Pause(); }
-	public static void Resume() { Current.MusicSource.Play(); }
-	public static void Stop() { Current.MusicSource.Stop(); }
-	public static void Seek( Timing timing )
+	public static void Pause() { Current_.MusicSource_.Pause(); }
+	public static void Resume() { Current_.MusicSource_.Play(); }
+	public static void Stop() { Current_.MusicSource_.Stop(); }
+	public static void Seek(Timing timing)
 	{
-		Current.MusicSource.source.timeSamples = (int)(timing.totalUnit * MusicTimeUnit * Current.SamplingRate);
+		Section section = null;
+		for( int i=0; i<SectionCount; ++i )
+		{
+			if( i + 1 < SectionCount )
+			{
+				if( timing < Current_[i+1].StartTiming )
+				{
+					section = Current_[i];
+				}
+			}
+			else
+			{
+				section = Current_[i];
+			}
+		}
+		int deltaMT = (timing.GetMusicalTime(section) - section.StartTiming.GetMusicalTime(section));
+		Current_.MusicSource_.timeSamples = section.StartTimeSamples + (int)(deltaMT* MusicTimeUnit * Current_.SamplingRate_);
 	}
-	public static void SeekToSection( string sectionName )
+	public static void SeekToSection(string sectionName)
 	{
-		Section targetSection = GetSection( sectionName );
+		Section targetSection = GetSection(sectionName);
 		if( targetSection != null )
 		{
-			Current.MusicSource.source.timeSamples = targetSection.StartTimeSamples_;
-			Current.SectionIndex = Current.sections.IndexOf( targetSection );
-			Current.OnSectionChanged();
+			Current_.MusicSource_.timeSamples = targetSection.StartTimeSamples;
+			Current_.SectionIndex_ = Current_.Sections.IndexOf(targetSection);
+			Current_.OnSectionChanged();
 		}
 		else
 		{
-			Debug.LogWarning( "Can't find section name: " + sectionName );
+			Debug.LogWarning("Can't find section name: " + sectionName);
 		}
 	}
-	public static void SetVolume( float volume )
+	public static void SetVolume(float volume)
 	{
-		Current.MusicSource.SetVolume( volume );
+		Current_.MusicSource_.volume = volume;
 	}
 	#endregion
 
 	#region private properties
-	private Timing Now_;
+	private Timing Near_;
 	private Timing Just_;
-	private bool isJustChanged_;
-	private bool isNowChanged_;
-	private bool isFormerHalf_;
-	private double dtFromJust_;
-	private int numRepeat_;
+	private bool IsJustChanged_;
+	private bool IsNearChanged_;
+	private bool IsFormerHalf_;
+	private double TimeSecFromJust_;
+	private int NumRepeat_;
 	private double MusicTimeUnit_;
 
-	private double lag_
+	private double Lag_
 	{
 		get
 		{
-			if ( isFormerHalf_ )
-				return dtFromJust_;
+			if( IsFormerHalf_ )
+				return TimeSecFromJust_;
 			else
-				return dtFromJust_ - MusicTimeUnit_;
+				return TimeSecFromJust_ - MusicTimeUnit_;
 		}
 	}
-	private double lagAbs_
+	private double LagAbs_
 	{
 		get
 		{
-			if ( isFormerHalf_ )
-				return dtFromJust_;
+			if( IsFormerHalf_ )
+				return TimeSecFromJust_;
 			else
-				return MusicTimeUnit_ - dtFromJust_;
-		}
-	}
-	private double lagUnit_ { get { return lag / MusicTimeUnit_; } }
-	private double MusicalTime_ { get { return Just.totalUnit + dtFromJust / MusicTimeUnit; } }
-	private float AudioTime_ { get { return MusicSource.GetTime(); } }
-	private long TimeSamples_ { get { return MusicSource.GetTimeSamples(); } }
-	private int SectionCount_ { get { return sections.Count; } }
-	private int mtBar_ { get { return CurrentSection.mtBar_; } }
-	private int mtBeat_ { get { return CurrentSection.mtBeat_; } }
-	private bool isPlaying { get { return MusicSource != null && MusicSource.IsPlaying(); } }
+				return MusicTimeUnit_ - TimeSecFromJust_;
+		}
+	}
+	private double LagUnit_ { get { return Lag / MusicTimeUnit_; } }
+	private float MusicalTime_ { get { return (float)(Just_.GetMusicalTime(CurrentSection_) + TimeSecFromJust_ / MusicTimeUnit_); } }
+	private float MusicalTimeBar_ { get { return MusicalTime_/CurrentSection_.UnitPerBar; } }
+	private float AudioTimeSec_ { get { return MusicSource_.time; } }
+	private int TimeSamples_ { get { return MusicSource_.timeSamples; } }
+	private int SectionCount_ { get { return Sections.Count; } }
+	private int UnitPerBar_ { get { return CurrentSection.UnitPerBar; } }
+	private int UnitPerBeat_ { get { return CurrentSection.UnitPerBeat; } }
+	private bool IsPlaying_ { get { return MusicSource_ != null && MusicSource_.isPlaying; } }
+	private Section CurrentSection_ { get { return Sections[SectionIndex_]; } }
 	#endregion
 
 	#region private predicates
-	private bool IsNowChangedWhen_( System.Predicate<Timing> pred )
+	private bool IsNearChangedWhen_(System.Predicate<Timing> pred)
 	{
-		return isNowChanged_ && pred( Now_ );
+		return IsNearChanged_ && pred(Near_);
 	}
-	private bool IsNowChangedBar_()
+	private bool IsNearChangedBar_()
 	{
-		return isNowChanged_ && Now_.barUnit == 0;
+		return IsNearChanged_ && Near_.Beat == 0 && Near_.Unit == 0;
 	}
-	private bool IsNowChangedBeat_()
+	private bool IsNearChangedBeat_()
 	{
-		return isNowChanged_ && Now_.unit == 0;
+		return IsNearChanged_ && Near_.Unit == 0;
 	}
-	private bool IsNowChangedAt_( int bar, int beat = 0, int unit = 0 )
+	private bool IsNearChangedAt_(int bar, int beat = 0, int unit = 0)
 	{
-		return isNowChanged_ &&
-			Now_.bar == bar && Now_.beat == beat && Now_.unit == unit;
+		return IsNearChanged_ &&
+			Near_.Bar == bar && Near_.Beat == beat && Near_.Unit == unit;
 	}
-	private bool IsJustChangedWhen_( System.Predicate<Timing> pred )
+	private bool IsJustChangedWhen_(System.Predicate<Timing> pred)
 	{
-		return isJustChanged_ && pred( Just_ );
+		return IsJustChanged_ && pred(Just_);
 	}
 	private bool IsJustChangedBar_()
 	{
-		return isJustChanged_ && Just_.barUnit == 0;
+		return IsJustChanged_ && Just_.Beat == 0 && Just_.Unit == 0;
 	}
 	private bool IsJustChangedBeat_()
 	{
-		return isJustChanged_ && Just_.unit == 0;
+		return IsJustChanged_ && Just_.Unit == 0;
 	}
-	private bool IsJustChangedAt_( int bar = 0, int beat = 0, int unit = 0 )
+	private bool IsJustChangedAt_(int bar = 0, int beat = 0, int unit = 0)
 	{
-		return isJustChanged_ &&
-			Just_.bar == bar && Just_.beat == beat && Just_.unit == unit;
+		return IsJustChanged_ &&
+			Just_.Bar == bar && Just_.Beat == beat && Just_.Unit == unit;
 	}
 	#endregion
 
 	#region private params
-	//music current params
-	SoundCue MusicSource;
-	int SectionIndex;
-	Section CurrentSection_ { get { return sections[SectionIndex]; } }
-	List<AudioSource> QuantizedCue = new List<AudioSource>();
-
-	//readonly params
-	static readonly float pitchUnit = Mathf.Pow( 2.0f, 1.0f / 12.0f );
-	int SamplingRate;// = 44100;
-	long SamplesPerUnit;
-	long SamplesPerBeat;
-	long SamplesPerBar;
-	long SamplesInLoop;
-
-	//others
-	Timing OldNow, OldJust;
-	int NumLoopBar;
+	AudioSource MusicSource_;
+	int SectionIndex_;
+	int CurrentSample_;
+
+	int SamplingRate_;
+	int SamplesPerUnit_;
+	int SamplesPerBeat_;
+	int SamplesPerBar_;
+	int SamplesInLoop_;
+
+	Timing OldNear_, OldJust_;
+	int NumLoopBar_;
+	List<AudioSource> QuantizedCue_ = new List<AudioSource>();
+	static readonly float PITCH_UNIT = Mathf.Pow(2.0f, 1.0f / 12.0f);
 	#endregion
 
-	#region Initialize & Update
+	#region private functions
 	void Awake()
 	{
 #if UNITY_EDITOR
@@ -405,21 +445,21 @@ void Awake()
 			return;
 		}
 #endif
-		MusicList.Add( this );
-		if( Current == null || audio.playOnAwake )
+		MusicList_.Add(this);
+		MusicSource_ = GetComponent<AudioSource>();
+		if( Current_ == null || MusicSource_.playOnAwake )
 		{
-			Current = this;
+			Current_ = this;
 		}
-		MusicSource = new SoundCue( audio );
-		SamplingRate = audio.clip.frequency;
-		if( audio.loop )
+		SamplingRate_ = MusicSource_.clip.frequency;
+		if( MusicSource_.loop )
 		{
-			SamplesInLoop = audio.clip.samples;
-			Section lastSection = sections[sections.Count - 1];
-			long samplesPerUnit = (long)(SamplingRate * (60.0 / (lastSection.Tempo_ * lastSection.mtBeat_)));
-			long samplesPerBar = samplesPerUnit * lastSection.mtBar_;
-			NumLoopBar = lastSection.StartTiming_.bar +
-				Mathf.RoundToInt( (float)(SamplesInLoop - lastSection.StartTimeSamples_) / (float)samplesPerBar );
+			SamplesInLoop_ = MusicSource_.clip.samples;
+			Section lastSection = Sections[Sections.Count - 1];
+			double beatSec = (60.0 / lastSection.Tempo);
+			int samplesPerBar = (int)(SamplingRate_ * lastSection.UnitPerBar * (beatSec/lastSection.UnitPerBeat));
+			NumLoopBar_ = lastSection.StartTiming.Bar +
+				Mathf.RoundToInt((float)(SamplesInLoop_ - lastSection.StartTimeSamples) / (float)samplesPerBar);
 		}
 
 		Initialize();
@@ -435,7 +475,7 @@ void Start()
 	// Update is called once per frame
 	void Update()
 	{
-		if( isPlaying )
+		if( IsPlaying_ )
 		{
 			UpdateTiming();
 		}
@@ -443,251 +483,206 @@ void Update()
 
 	void OnValidate()
 	{
-		if( SamplingRate == 0 )
+		if( MusicSource_ == null )
 		{
-			SamplingRate = (audio != null ? audio.clip.frequency : 44100);
+			MusicSource_ = GetComponent<AudioSource>();
+		}
+		if( SamplingRate_ == 0 )
+		{
+			SamplingRate_ = (MusicSource_ != null ? MusicSource_.clip.frequency : 44100);
 		}
 
-		if( sections == null || sections.Count == 0 )
+		if( Sections == null || Sections.Count == 0 )
 		{
-			sections = new List<Section>();
-			sections.Add( new Section( new Timing( 0 ), 4, 16, 120 ) );
-			sections[0].OnValidate( delayTimeSamples, 0 );
+			Sections = new List<Section>();
+			Sections.Add(new Section(new Timing(0), 4, 16, 120));
+			Sections[0].OnValidate(EntryPointSample);
 		}
 		else
 		{
 			bool isValidated = true;
-			int timeSamples = delayTimeSamples;
-			int totalUnit = 0;
-			for( int i = 0; i < sections.Count; i++ )
+			int timeSamples = EntryPointSample;
+			for( int i = 0; i < Sections.Count; i++ )
 			{
-				if( sections[i].StartTotalUnit_ != totalUnit || sections[i].StartTimeSamples_ != timeSamples ) isValidated = false;
+				if( Sections[i].StartTimeSamples != timeSamples ) isValidated = false;
 				if( !isValidated )
 				{
 					isValidated = false;
-					sections[i].OnValidate( timeSamples, totalUnit );
+					Sections[i].OnValidate(timeSamples);
 				}
-				if( i+1 < sections.Count )
+				if( i+1 < Sections.Count )
 				{
-					int d = (sections[i+1].StartTiming_.bar  - sections[i].StartTiming_.bar)  * sections[i].mtBar_
-						   +(sections[i+1].StartTiming_.beat - sections[i].StartTiming_.beat) * sections[i].mtBeat_
-						   +(sections[i+1].StartTiming_.unit - sections[i].StartTiming_.unit);
-					totalUnit += d;
-					timeSamples += (int)((d / sections[i].mtBeat_) * (60.0f / sections[i].Tempo_) * SamplingRate);
+					int d = (Sections[i+1].StartTiming.Bar  - Sections[i].StartTiming.Bar)  * Sections[i].UnitPerBar
+						   +(Sections[i+1].StartTiming.Beat - Sections[i].StartTiming.Beat) * Sections[i].UnitPerBeat
+						   +(Sections[i+1].StartTiming.Unit - Sections[i].StartTiming.Unit);
+					timeSamples += (int)((d / Sections[i].UnitPerBeat) * (60.0f / Sections[i].Tempo) * SamplingRate_);
 				}
 			}
 		}
 	}
 
+	void OnDestroy()
+	{
+		MusicList_.Remove(this);
+	}
+
 	void Initialize()
 	{
-		if( Current != null && isJustChanged && Just.totalUnit == 0 )
-		{
-			Now_ = new Timing( 0, 0, 0 );
-			isJustChanged_ = true;
-		}
-		else
-		{
-			Now_ = new Timing( 0, 0, -1 );
-			isJustChanged_ = false;
-		}
-		Just_ = new Timing( Now_ );
-		OldNow = new Timing( Now_ );
-		OldJust = new Timing( Just_ );
-		dtFromJust_ = 0;
-		isFormerHalf_ = true;
-		numRepeat_ = 0;
+		IsJustChanged_ = false;
+		IsNearChanged_ = false;
+		Near_ = new Timing(0, 0, -1);
+		Just_ = new Timing(Near_);
+		OldNear_ = new Timing(Near_);
+		OldJust_ = new Timing(Just_);
+		TimeSecFromJust_ = 0;
+		IsFormerHalf_ = true;
+		NumRepeat_ = 0;
 	}
 
 	void OnSectionChanged()
 	{
-		if( sections == null || sections.Count == 0 ) return;
-		if( CurrentSection_.Tempo_ > 0.0f )
+		if( Sections == null || Sections.Count == 0 ) return;
+		if( CurrentSection_.Tempo > 0.0f )
 		{
-			SamplesPerUnit = (long)( SamplingRate * ( 60.0 / ( CurrentSection_.Tempo_ * CurrentSection_.mtBeat_ ) ) );
-			SamplesPerBeat = SamplesPerUnit*CurrentSection_.mtBeat_;
-			SamplesPerBar = SamplesPerUnit*CurrentSection_.mtBar_;
-			MusicTimeUnit_ = (double)SamplesPerUnit / (double)SamplingRate;
+			double beatSec = (60.0 / CurrentSection_.Tempo);
+			SamplesPerUnit_ = (int)(SamplingRate_ * (beatSec/CurrentSection_.UnitPerBeat));
+			SamplesPerBeat_ =(int)(SamplingRate_ * beatSec);
+			SamplesPerBar_ = (int)(SamplingRate_ * CurrentSection_.UnitPerBar * (beatSec/CurrentSection_.UnitPerBeat));
+			MusicTimeUnit_ = (double)SamplesPerUnit_ / (double)SamplingRate_;
 		}
 		else
 		{
-			SamplesPerUnit = int.MaxValue;
-			SamplesPerBeat = int.MaxValue;
-			SamplesPerBar = int.MaxValue;
-			MusicTimeUnit_ = int.MaxValue;
+			SamplesPerUnit_ = 0;
+			SamplesPerBeat_ = 0;
+			SamplesPerBar_ = 0;
+			MusicTimeUnit_ = 0;
 		}
 	}
 
 	void PlayStart()
 	{
-		if ( Current != null && IsPlaying() )
+		if( Current_ != null && IsPlaying )
 		{
 			Stop();
 		}
-		if( Current.debugText != null )
-		{
-			Current.debugText.text = "";
-		}
 
-		Current = this;
+		Current_ = this;
 		Initialize();
-		MusicSource.Play();
+		MusicSource_.Play();
 	}
 
 	void UpdateTiming()
 	{
-		isNowChanged_ = false;
-		isJustChanged_ = false;
-		
-		if( SectionIndex < 0 || sections.Count <= SectionIndex )
+		// find section index
+		int newIndex = SectionIndex_;
+		int oldSample = CurrentSample_;
+		CurrentSample_ = MusicSource_.timeSamples;
+		if( SectionIndex_ + 1 >= Sections.Count )
 		{
-			Debug.LogWarning( "Music:" + name + " has invalid SectionIndex = " + SectionIndex + ", sections.Count = " + sections.Count );
-			return;
-		}
-		long numSamples = MusicSource.GetTimeSamples();
-
-
-		int NewIndex = -1;
-		for( int i = SectionIndex; i < sections.Count; i++ )
-		{
-			if( sections[i].StartTimeSamples_ <= numSamples && (sections.Count <= i + 1 || numSamples < sections[i + 1].StartTimeSamples_) )
+			if( CurrentSample_ < oldSample )
 			{
-				NewIndex = i;
-				break;
+				newIndex = 0;
 			}
 		}
-		if( NewIndex < 0 )
+		else
 		{
-			if( 0 <= numSamples && numSamples < delayTimeSamples )
+			if( Sections[SectionIndex_ + 1].StartTimeSamples <= CurrentSample_ )
 			{
-				NewIndex = 0;
-				Initialize();
-				OnSectionChanged();
-			}
-			else
-			{
-				for( int i = 0; i < SectionIndex; i++ )
-				{
-					if( sections[i].StartTimeSamples_ <= numSamples && numSamples < sections[i + 1].StartTimeSamples_ )
-					{
-						NewIndex = i;
-					}
-				}
+				newIndex = SectionIndex_ + 1;
 			}
 		}
 
-		if( NewIndex != SectionIndex )
+		if( newIndex != SectionIndex_ )
 		{
-			SectionIndex = NewIndex;
+			SectionIndex_ = newIndex;
 			OnSectionChanged();
 		}
 
-		numSamples -= CurrentSection_.StartTimeSamples_;
-		if ( numSamples >= 0 )
+		// calc current timing
+		IsNearChanged_ = false;
+		IsJustChanged_ = false;
+		int sectionSample = CurrentSample_ - CurrentSection_.StartTimeSamples;
+		if( sectionSample >= 0 )
 		{
-			Just_.bar = (int)( numSamples / SamplesPerBar ) + CurrentSection_.StartTiming_.bar;
-			Just_.beat = (int)((numSamples % SamplesPerBar) / SamplesPerBeat) +CurrentSection_.StartTiming_.beat;
-			Just_.unit = (int)(((numSamples % SamplesPerBar) % SamplesPerBeat) / SamplesPerUnit) +CurrentSection_.StartTiming_.unit;
-			if( Just_.unit >= CurrentSection_.mtBeat_ )
+			Just_.Bar = (int)(sectionSample / SamplesPerBar_) + CurrentSection_.StartTiming.Bar;
+			Just_.Beat = (int)((sectionSample % SamplesPerBar_) / SamplesPerBeat_) + CurrentSection_.StartTiming.Beat;
+			Just_.Unit = (int)(((sectionSample % SamplesPerBar_) % SamplesPerBeat_) / SamplesPerUnit_) + CurrentSection_.StartTiming.Unit;
+			Just_.Fix(CurrentSection_);
+			if( SectionIndex_ + 1 >= Sections.Count )
 			{
-				Just_.beat += (int)(Just_.unit / CurrentSection_.mtBeat_);
-				Just_.unit %= CurrentSection_.mtBeat_;
+				if( NumLoopBar_ > 0 )
+				{
+					while( Just_.Bar >= NumLoopBar_ )
+					{
+						Just_.Decrement(CurrentSection_);
+					}
+				}
 			}
-			int barUnit = Just_.beat * CurrentSection_.mtBeat_ + Just_.unit;
-			if( barUnit >= CurrentSection_.mtBar_ )
+			else
 			{
-				Just_.bar += (int)(barUnit / CurrentSection_.mtBar_);
-				Just_.beat = 0;
-				Just_.unit = (barUnit % CurrentSection_.mtBar_);
-				if( Just_.unit >= CurrentSection_.mtBeat_ )
+				while( Just_ >= Sections[SectionIndex_+1].StartTiming )
 				{
-					Just_.beat += (int)(Just_.unit / CurrentSection_.mtBeat_);
-					Just_.unit %= CurrentSection_.mtBeat_;
+					Just_.Decrement(CurrentSection_);
 				}
 			}
-			if ( NumLoopBar > 0 ) Just_.bar %= NumLoopBar;
 
-			isFormerHalf_ = ( numSamples % SamplesPerUnit ) < SamplesPerUnit / 2;
-			dtFromJust_ = (double)( numSamples % SamplesPerUnit ) / (double)SamplingRate;
+			Just_.Subtract(CurrentSection_.StartTiming, CurrentSection_);
+			TimeSecFromJust_ = (double)(sectionSample - Just_.Bar * SamplesPerBar_ - Just_.Beat * SamplesPerBeat_ - Just_.Unit * SamplesPerUnit_) / (double)SamplingRate_;
+			IsFormerHalf_ = (TimeSecFromJust_ * SamplingRate_) < SamplesPerUnit_ / 2;
+			Just_.Add(CurrentSection_.StartTiming, CurrentSection_);
 
-			Now_.Copy( Just_ );
-			if ( !isFormerHalf_ ) Now_.Increment();
-			if ( SamplesInLoop != 0 && numSamples + SamplesPerUnit/2 >= SamplesInLoop )
+			Near_.Copy(Just_);
+			if( !IsFormerHalf_ ) Near_.Increment(CurrentSection_);
+			if( SamplesInLoop_ != 0 && CurrentSample_ + SamplesPerUnit_/2 >= SamplesInLoop_ )
 			{
-				Now_.Init();
+				Near_.Init();
 			}
 
-			isNowChanged_ = Now_.totalUnit != OldNow.totalUnit;
-			isJustChanged_ = Just_.totalUnit != OldJust.totalUnit;
+			IsNearChanged_ = (Near_.Equals(OldNear_) == false);
+			IsJustChanged_ = (Just_.Equals(OldJust_) == false);
 
 			CallEvents();
 
-			OldNow.Copy( Now_ );
-			OldJust.Copy( Just_ );
-		}
-		else
-		{
-			//Debug.LogWarning( "Warning!! Failed to GetNumPlayedSamples" );
+			OldNear_.Copy(Near_);
+			OldJust_.Copy(Just_);
 		}
 
-		DebugUpdateText();
+		//DebugUpdateText();
 	}
 
+	/* DebugUpdateText
 	void DebugUpdateText()
 	{
-		if( debugText != null )
+		if( DebugText != null )
 		{
-			debugText.text = "Just = " + Just_.ToString() + ", MusicalTime = " + MusicalTime_;
-			if( sections.Count > 0 )
+			DebugText.text = "Just_ = " + Just_.ToString() + ", MusicalTime = " + MusicalTime_;
+			if( Sections.Count > 0 )
 			{
-				debugText.text += System.Environment.NewLine + "section[" + SectionIndex + "] = " + CurrentSection_.ToString();
+				DebugText.text += System.Environment.NewLine + "section[" + SectionIndex_ + "] = " + CurrentSection_.ToString();
 			}
 		}
 	}
-	#endregion
+	*/
 
-	#region Events
 	void CallEvents()
 	{
-		if ( isNowChanged_ ) OnNowChanged();
-		if ( isNowChanged_ && OldNow > Now_ )
-		{
-			WillRepeat();
-		}
-		if ( isJustChanged_ ) OnJustChanged();
-		if ( isJustChanged_ && Just_.unit == 0 ) OnBeat();
-		if ( isJustChanged_ && Just_.barUnit == 0 ) OnBar();
-		if ( isJustChanged_ && OldJust > Just_ )
+		if( IsJustChanged_ ) OnJustChanged();
+		if( IsJustChanged_ && Just_.Unit == 0 ) OnBeat();
+		if( IsJustChanged_ && Just_.Unit == 0 && Just_.Beat == 0 ) OnBar();
+		if( IsJustChanged_ && OldJust_ > Just_ )
 		{
 			OnRepeated();
 		}
-		
-		/*
-		if ( isJustChanged_ && Just_.totalUnit > 0 )
-		{
-			Timing tempOld = new Timing( OldJust );
-			tempOld.Increment();
-			if ( tempOld.totalUnit != Just_.totalUnit )
-			{
-				//This often happens when the frame rate is slow.
-				Debug.LogWarning( "Skipped some timing: OldJust = " + OldJust.ToString() + ", Just = " + Just_.ToString() );
-			}
-		}
-		*/
 	}
 
 	//On events (when isJustChanged)
-	void OnNowChanged()
-	{
-	}
-
 	void OnJustChanged()
 	{
-		foreach ( AudioSource cue in QuantizedCue )
+		foreach( AudioSource cue in QuantizedCue_ )
 		{
 			cue.Play();
 		}
-		QuantizedCue.Clear();
+		QuantizedCue_.Clear();
 	}
 
 	void OnBeat()
@@ -700,12 +695,7 @@ void OnBar()
 
 	void OnRepeated()
 	{
-		++numRepeat_;
-	}
-
-	//Will events (when isNowChanged)
-	void WillRepeat()
-	{
+		++NumRepeat_;
 	}
 	#endregion
 }
@@ -713,118 +703,90 @@ void WillRepeat()
 [Serializable]
 public class Timing : IComparable<Timing>, IEquatable<Timing>
 {
-	public Timing( int b = 0, int be = 0, int u = 0 )
+	public Timing(int bar = 0, int beat = 0, int unit = 0)
 	{
-		bar = b;
-		beat = be;
-		unit = u;
-		_cachedSectionIndex = 0;
+		Bar = bar;
+		Beat = beat;
+		Unit = unit;
 	}
 
-	public Timing( Timing copy )
+	public Timing(Timing copy)
 	{
-		Copy( copy );
+		Copy(copy);
 	}
 	public Timing() { this.Init(); }
-	public void Init() { bar = 0; beat = 0; unit = 0; _cachedSectionIndex = 0; }
-	public void Copy( Timing copy )
+	public void Init() { Bar = 0; Beat = 0; Unit = 0; }
+	public void Copy(Timing copy)
 	{
-		bar = copy.bar;
-		beat = copy.beat;
-		unit = copy.unit;
-		_cachedSectionIndex = copy._cachedSectionIndex;
+		Bar = copy.Bar;
+		Beat = copy.Beat;
+		Unit = copy.Unit;
 	}
 
-	public int bar, beat, unit;
+	public int Bar, Beat, Unit;
 
-	public int totalUnit
+	public int CurrentMusicalTime { get { return GetMusicalTime(Music.CurrentSection); } }
+	public int GetMusicalTime(Music.Section section)
 	{
-		get
-		{
-			return CurrentSection.StartTotalUnit_
-				+ ( bar  - CurrentSection.StartTiming_.bar )  * CurrentSection.mtBar_
-					+ ( beat - CurrentSection.StartTiming_.beat ) * CurrentSection.mtBeat_
-					+ ( unit - CurrentSection.StartTiming_.unit );
-		}
+		return Bar * section.UnitPerBar + Beat * section.UnitPerBeat + Unit;
 	}
-	public int barUnit { get { return ( unit < 0 ? CurrentSection.mtBar_ - unit : CurrentSection.mtBeat_ * beat + unit )%CurrentSection.mtBar_; } }
-	public void Increment()
+	public void Fix(Music.Section section)
 	{
-		unit++;
-		if ( CurrentSection.mtBeat_ * beat + unit >= CurrentSection.mtBar_ )
-		{
-			unit = 0;
-			beat = 0;
-			bar += 1;
-		}
-		else if ( unit >= CurrentSection.mtBeat_ )
-		{
-			unit = 0;
-			beat += 1;
-		}
+		int totalUnit = Bar * section.UnitPerBar + Beat * section.UnitPerBeat + Unit;
+		Bar = totalUnit / section.UnitPerBar;
+		Beat = (totalUnit - Bar*section.UnitPerBar) / section.UnitPerBeat;
+		Unit = (totalUnit - Bar*section.UnitPerBar - Beat * section.UnitPerBeat);
 	}
-	public void IncrementBeat()
+	public void Increment(Music.Section section)
 	{
-		beat++;
-		if ( CurrentSection.mtBeat_ * beat + unit >= CurrentSection.mtBar_ )
-		{
-			beat = 0;
-			bar += 1;
-		}
+		Unit++;
+		Fix(section);
 	}
-
-	int _cachedSectionIndex = 0;
-	int sectionIndex
+	public void Decrement(Music.Section section)
 	{
-		get
-		{
-			if( _cachedSectionIndex >= Music.SectionCount || 
-			   this < Music.GetSection(_cachedSectionIndex).StartTiming_ || 
-				( _cachedSectionIndex < Music.SectionCount-1 && Music.GetSection(_cachedSectionIndex+1).StartTiming_ <= this ) )
-			{
-				if( Music.GetSection(Music.SectionCount-1).StartTiming_ <= this )
-				{
-					_cachedSectionIndex = Music.SectionCount-1;
-				}
-				else
-				{
-					_cachedSectionIndex = 0;
-					for( int i=1; i<Music.SectionCount; i++ )
-					{
-						if( this < Music.GetSection(i).StartTiming_ )
-						{
-							_cachedSectionIndex = i - 1;
-							break;
-						}
-					}
-				}
-			}
-			return _cachedSectionIndex;
-		}
+		Unit--;
+		Fix(section);
+	}
+	public void IncrementBeat(Music.Section section)
+	{
+		Beat++;
+		Fix(section);
+	}
+	public void Add(Timing t, Music.Section section)
+	{
+		Bar += t.Bar;
+		Beat += t.Beat;
+		Unit += t.Unit;
+		Fix(section);
+	}
+	public void Subtract(Timing t, Music.Section section)
+	{
+		Bar -= t.Bar;
+		Beat -= t.Beat;
+		Unit -= t.Unit;
+		Fix(section);
 	}
-	Music.Section CurrentSection{ get{ return Music.GetSection(sectionIndex); } }
 
-	public static bool operator >( Timing t, Timing t2 ) { return t.bar > t2.bar || ( t.bar == t2.bar && t.beat > t2.beat ) || ( t.bar == t2.bar && t.beat == t2.beat && t.unit > t2.unit ) ; }
-	public static bool operator <( Timing t, Timing t2 ) { return !( t > t2 ) && !( t.Equals( t2 ) ); }
-	public static bool operator <=( Timing t, Timing t2 ) { return !( t > t2 ); }
-	public static bool operator >=( Timing t, Timing t2 ) { return t > t2 || t.Equals( t2 ); }
-	public static int operator -( Timing t, Timing t2 ) { return t.totalUnit - t2.totalUnit; }
+	public static bool operator >(Timing t, Timing t2) { return t.Bar > t2.Bar || (t.Bar == t2.Bar && t.Beat > t2.Beat) || (t.Bar == t2.Bar && t.Beat == t2.Beat && t.Unit > t2.Unit); }
+	public static bool operator <(Timing t, Timing t2) { return !(t > t2) && !(t.Equals(t2)); }
+	public static bool operator <=(Timing t, Timing t2) { return !(t > t2); }
+	public static bool operator >=(Timing t, Timing t2) { return t > t2 || t.Equals(t2); }
 
-	public override bool Equals( object obj )
+	public override bool Equals(object obj)
 	{
-		if ( object.ReferenceEquals( obj, null ) )
+		if( object.ReferenceEquals(obj, null) )
 		{
 			return false;
 		}
-		if ( object.ReferenceEquals( obj, this ) )
+		if( object.ReferenceEquals(obj, this) )
 		{
 			return true;
 		}
-		if ( this.GetType() != obj.GetType() )
+		if( this.GetType() != obj.GetType() )
 		{
 			return false;
 		}
-		return this.Equals( obj as Timing );
+		return this.Equals(obj as Timing);
 	}
 
 	public override int GetHashCode()
@@ -832,20 +794,20 @@ public override int GetHashCode()
 		return base.GetHashCode();
 	}
 
-	public bool Equals( Timing other )
+	public bool Equals(Timing other)
 	{
-		return ( this.bar == other.bar && this.beat == other.beat && this.unit == other.unit );
+		return (this.Bar == other.Bar && this.Beat == other.Beat && this.Unit == other.Unit);
 	}
 
-	public int CompareTo( Timing tother )
+	public int CompareTo(Timing tother)
 	{
-		if ( this.Equals( tother ) ) return 0;
-		else if ( this > tother ) return 1;
+		if( this.Equals(tother) ) return 0;
+		else if( this > tother ) return 1;
 		else return -1;
 	}
 
 	public override string ToString()
 	{
-		return bar + " " + beat + " " + unit;
+		return Bar + " " + Beat + " " + Unit;
 	}
 }
\ No newline at end of file