diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..abb8881
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <clangFormatSettings>
+      <option name="ENABLED" value="true" />
+    </clangFormatSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..307554b
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/src/Parser.cpp b/src/Parser.cpp
index bd312b5..38e7e53 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -53,6 +53,7 @@ class threadRAII {
     }
   }
 };
+
 enum Channel {
   LaneAutoplay = 1,
   SectionRate = 2,
@@ -91,6 +92,7 @@ void Parser::SetRandomSeed(unsigned int RandomSeed) { Seed = RandomSeed; }
 
 int Parser::NoWav = -1;
 int Parser::MetronomeWav = -2;
+
 inline bool Parser::MatchHeader(const std::string_view &str,
                                 const std::string_view &headerUpper) {
   auto size = headerUpper.length();
@@ -150,6 +152,7 @@ void Parser::Parse(const std::filesystem::path &fpath, Chart **chart,
             << "\n";
 #endif
 }
+
 void Parser::Parse(const std::vector<unsigned char> &bytes, Chart **chart,
                    bool addReadyMeasure, bool metaOnly,
                    std::atomic_bool &bCancelled) {
@@ -410,6 +413,7 @@ void Parser::Parse(const std::vector<unsigned char> &bytes, Chart **chart,
 #if BMS_PARSER_VERBOSE == 1
   midStartTime = std::chrono::high_resolution_clock::now();
 #endif
+  double measureBeatPosition = 0;
   for (auto measureIdx = 0; measureIdx <= lastMeasure; ++measureIdx) {
     if (bCancelled) {
       return;
@@ -708,7 +712,7 @@ void Parser::Parse(const std::vector<unsigned char> &bytes, Chart **chart,
           240000000.0 * (position - lastPosition) * measure->Scale / currentBpm;
       timePassed += interval;
       timeline->Timing = static_cast<long long>(timePassed);
-      timeline->BeatPosition = measureIdx + position;
+      timeline->BeatPosition = measureBeatPosition + position * measure->Scale;
       if (timeline->BpmChange) {
         currentBpm = timeline->Bpm;
         minBpm = std::min(minBpm, timeline->Bpm);
@@ -739,13 +743,17 @@ void Parser::Parse(const std::vector<unsigned char> &bytes, Chart **chart,
     if (!metaOnly && measure->TimeLines.empty()) {
       auto timeline = new TimeLine(TempKey, metaOnly);
       timeline->Timing = static_cast<long long>(timePassed);
-      timeline->BeatPosition = measureIdx;
+      timeline->BeatPosition = measureBeatPosition;
       timeline->Bpm = currentBpm;
       measure->TimeLines.push_back(timeline);
     }
+    if (!metaOnly) {
+      measure->TimeLines[0]->IsFirstInMeasure = true;
+    }
     new_chart->Meta.PlayLength = static_cast<long long>(timePassed);
     timePassed +=
         240000000.0 * (1 - lastPosition) * measure->Scale / currentBpm;
+    measureBeatPosition += measure->Scale;
     if (!metaOnly) {
       new_chart->Measures.push_back(measure);
     } else {
@@ -960,6 +968,7 @@ inline int Parser::ToWaveId(Chart *Chart, std::string_view Wav, bool metaOnly) {
   return Chart->WavTable.find(decoded) != Chart->WavTable.end() ? decoded
                                                                 : NoWav;
 }
+
 inline int Parser::ParseHex(std::string_view Str) {
   auto result = 0;
   for (size_t i = 0; i < Str.length(); ++i) {
@@ -974,6 +983,7 @@ inline int Parser::ParseHex(std::string_view Str) {
   }
   return result;
 }
+
 inline int Parser::ParseInt(std::string_view Str, bool forceBase36) const {
   if (forceBase36 || !UseBase62) {
     auto result = static_cast<int>(std::strtol(Str.data(), nullptr, 36));
diff --git a/src/TimeLine.h b/src/TimeLine.h
index afda845..bfdcfd8 100644
--- a/src/TimeLine.h
+++ b/src/TimeLine.h
@@ -60,5 +60,6 @@ class TimeLine {
   [[nodiscard]] double GetStopDuration() const;
 
   ~TimeLine();
+  bool IsFirstInMeasure = false;
 };
 } // namespace bms_parser