diff --git a/FeelsWidget/FeelsWidget.swift b/FeelsWidget/FeelsWidget.swift
index 8458fa7..ecae3e0 100644
--- a/FeelsWidget/FeelsWidget.swift
+++ b/FeelsWidget/FeelsWidget.swift
@@ -30,16 +30,14 @@ class WatchTimelineView: Identifiable {
 struct TimeLineCreator {
     static func createViews(daysBack: Int) -> [WatchTimelineView] {
         var timeLineView = [WatchTimelineView]()
-        var startDayOffset = 0
         
-        if !ShowBasedOnVoteLogics.passedTodaysVotingUnlock(voteDate: UserDefaultsStore.getOnboarding().date) {
-            startDayOffset = 1
-        }
+        let latestDayToShow = ShowBasedOnVoteLogics.getCurrentVotingDate(onboardingData: UserDefaultsStore.getOnboarding())
+        let dates = Array(0...daysBack).map({
+           Calendar.current.date(byAdding: .day, value: -$0, to: latestDayToShow)!
+        })
         
-        for day in startDayOffset..<daysBack{
-            let day = Calendar.current.date(byAdding: .day, value: -day, to: Date())!
-            
-            let dayStart = Calendar.current.startOfDay(for: day)
+        for date in dates {
+            let dayStart = Calendar.current.startOfDay(for: date)
             let dayEnd = Calendar.current.date(bySettingHour: 23, minute: 59, second: 59, of: dayStart)!
             let moodTint: MoodTintable.Type = UserDefaultsStore.moodTintable()
             let moodImages: MoodImagable.Type = UserDefaultsStore.moodMoodImagable()
@@ -58,6 +56,7 @@ struct TimeLineCreator {
                                                       secondaryColor: moodTint.secondary(forMood: .missing)))
             }
         }
+        
         timeLineView = timeLineView.sorted(by: { $0.date > $1.date  })
         return timeLineView
     }