diff --git a/src/fungible_staked_token.cairo b/src/fungible_staked_token.cairo
index 9a26b1e..e1a5879 100644
--- a/src/fungible_staked_token.cairo
+++ b/src/fungible_staked_token.cairo
@@ -13,7 +13,7 @@ pub trait IFungibleStakedToken<TContractState> {
 
     // The number of seconds (while total staked > 0) that have passed per total tokens staked
     // Can be used to compute the share of total staked tokens that a user has had over a period, by collecting two snapshots of the value
-    fn get_seconds_per_total_staked(self: @TContractState) -> u256;
+    fn get_seconds_per_total_staked(self: @TContractState, timestamp: u64) -> u256;
 
     // Delegates any staked tokens from the caller to the owner
     fn delegate(ref self: TContractState, to: ContractAddress);
@@ -175,6 +175,46 @@ pub mod FungibleStakedToken {
             }
             total_staked
         }
+
+        fn find_seconds_per_total_staked(
+            self: @ContractState, min_index: u64, max_index_exclusive: u64, timestamp: u64
+        ) -> u256 {
+            if (min_index == (max_index_exclusive - 1)) {
+                let snapshot = self.snapshots_by_index.read(min_index);
+                return if (snapshot.timestamp > timestamp) {
+                    0
+                } else {
+                    let difference = timestamp - snapshot.timestamp;
+                    let next = self.snapshots_by_index.read(min_index + 1);
+                    let staked_amount = if (next.timestamp.is_zero()) {
+                        self.total_staked.read()
+                    } else {
+                        // todo: this is wrong because it increments by seconds / total_staked, not total_staked * seconds
+                        (u256 { high: (next.timestamp - snapshot.timestamp).into(), low: 0 }
+                            / (next.seconds_per_total_staked - snapshot.seconds_per_total_staked))
+                            .try_into()
+                            .unwrap()
+                    };
+
+                    // todo: is rounding safe here?
+                    snapshot.seconds_per_total_staked + (difference.into() / staked_amount).into()
+                };
+            }
+            let mid = (min_index + max_index_exclusive) / 2;
+
+            let snapshot = self.snapshots_by_index.read(mid);
+
+            if (timestamp == snapshot.timestamp) {
+                return snapshot.seconds_per_total_staked;
+            }
+
+            // timestamp we are looking for is before snapshot
+            if (timestamp < snapshot.timestamp) {
+                self.find_seconds_per_total_staked(min_index, mid, timestamp)
+            } else {
+                self.find_seconds_per_total_staked(mid, max_index_exclusive, timestamp)
+            }
+        }
     }
 
     #[abi(embed_v0)]
@@ -249,23 +289,18 @@ pub mod FungibleStakedToken {
             self.total_staked.read()
         }
 
-        fn get_seconds_per_total_staked(self: @ContractState) -> u256 {
-            let (_, snapshot) = self.last_staked_snapshot();
-            let time_since_last = get_block_timestamp() - snapshot.timestamp;
-            if time_since_last.is_zero() {
-                snapshot.seconds_per_total_staked
+        fn get_seconds_per_total_staked(self: @ContractState, timestamp: u64) -> u256 {
+            assert(timestamp <= get_block_timestamp(), 'FUTURE');
+
+            let num_snapshots = self.num_snapshots.read();
+            return if (num_snapshots.is_zero()) {
+                0
             } else {
-                let current_staked = self.total_staked.read();
-                let last_cumulative = snapshot.seconds_per_total_staked;
-                if current_staked.is_zero() {
-                    last_cumulative
-                } else {
-                    last_cumulative
-                        + (u256 { high: time_since_last.into(), low: 0 } / current_staked.into())
-                            .try_into()
-                            .unwrap()
-                }
-            }
+                self
+                    .find_seconds_per_total_staked(
+                        min_index: 0, max_index_exclusive: num_snapshots, timestamp: timestamp
+                    )
+            };
         }
 
         fn delegate(ref self: ContractState, to: ContractAddress) {
diff --git a/src/fungible_staked_token_test.cairo b/src/fungible_staked_token_test.cairo
index 35bca1a..455c624 100644
--- a/src/fungible_staked_token_test.cairo
+++ b/src/fungible_staked_token_test.cairo
@@ -12,6 +12,7 @@ use governance::fungible_staked_token::{
     IFungibleStakedToken, IFungibleStakedTokenDispatcher, IFungibleStakedTokenDispatcherTrait,
     FungibleStakedToken
 };
+use governance::governor_test::{advance_time};
 use governance::interfaces::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
 use governance::staker::{IStakerDispatcher, IStakerDispatcherTrait};
 use governance::staker_test::{setup as setup_staker};
@@ -106,3 +107,27 @@ fn test_withdraw() {
     assert_eq!(staker.get_delegated(delegatee), 0);
     assert_eq!(staker.get_delegated(Zero::zero()), 0);
 }
+
+#[test]
+fn test_get_seconds_per_total_staked() {
+    let (_, token, fst) = setup();
+    token.approve(fst.contract_address, 100);
+    let start_time = get_block_timestamp();
+    fst.deposit();
+    advance_time(100);
+    fst.withdraw_amount(20);
+    advance_time(100);
+    fst.withdraw_amount(80);
+    assert_eq!(fst.get_seconds_per_total_staked(timestamp: start_time), 0);
+    assert_eq!(
+        fst.get_seconds_per_total_staked(timestamp: start_time + 50),
+        u256 { high: 50, low: 0 } / 100
+    );
+    assert_eq!(
+        fst.get_seconds_per_total_staked(timestamp: start_time + 100), u256 { high: 1, low: 0 }
+    );
+    assert_eq!(
+        fst.get_seconds_per_total_staked(timestamp: start_time + 150),
+        u256 { high: 1, low: 0 } + (u256 { high: 50, low: 0 } / 80)
+    );
+}
diff --git a/src/governor_test.cairo b/src/governor_test.cairo
index 93e62e7..f5dda64 100644
--- a/src/governor_test.cairo
+++ b/src/governor_test.cairo
@@ -47,7 +47,7 @@ pub(crate) fn anyone() -> ContractAddress {
     'anyone'.try_into().unwrap()
 }
 
-fn advance_time(by: u64) -> u64 {
+pub(crate) fn advance_time(by: u64) -> u64 {
     let next = get_block_timestamp() + by;
     set_block_timestamp(next);
     next