diff --git a/src/api/firebase.js b/src/api/firebase.js
index bc83666..e916fa6 100644
--- a/src/api/firebase.js
+++ b/src/api/firebase.js
@@ -10,7 +10,8 @@ import {
 } from 'firebase/firestore';
 import { useEffect, useState } from 'react';
 import { db } from './config';
-import { getFutureDate } from '../utils';
+import { getFutureDate, getDaysBetweenDates } from '../utils';
+import { calculateEstimate } from '@the-collab-lab/shopping-list-utils';
 
 /**
  * A custom hook that subscribes to the user's shopping lists in our Firestore
@@ -182,11 +183,7 @@ export async function addItem(listPath, { itemName, daysUntilNextPurchase }) {
 	}
 }
 
-export async function updateItem(
-	listPath,
-	itemId,
-	{ dateLastPurchased, totalPurchases },
-) {
+export async function updateItem(listPath, itemId, { totalPurchases }) {
 	/**
 	 * TODO: Fill this out so that it uses the correct Firestore function
 	 * to update an existing item. You'll need to figure out what arguments
@@ -196,12 +193,26 @@ export async function updateItem(
 	try {
 		// Get a reference to the specific item document in Firestore
 		const itemRef = doc(db, listPath, 'items', itemId);
+		const docSnap = await getDoc(itemRef);
+		const data = docSnap.data();
+
+		const lastPurchase = data.dateLastPurchased
+			? data.dateLastPurchased.toDate()
+			: data.dateCreated.toDate();
+		const nextPurchase = data.dateNextPurchased.toDate();
+
+		const prevEstimate = getDaysBetweenDates(lastPurchase, nextPurchase);
+		const daysSinceLastPurch = getDaysBetweenDates(lastPurchase, new Date());
+		const newEstimate = calculateEstimate(
+			prevEstimate,
+			daysSinceLastPurch,
+			data.totalPurchases,
+		);
 
 		await updateDoc(itemRef, {
-			dateLastPurchased: dateLastPurchased || new Date(), // Use the provided date or the current date
-			// totalPurchases need to be incremented every time the checkbox is ticked off
-			totalPurchases: totalPurchases, // Increment totalPurchases or set it to 1 if undefined
-			// dateNextPurchased will be addressed in the future
+			dateLastPurchased: new Date(),
+			totalPurchases: totalPurchases,
+			dateNextPurchased: getFutureDate(newEstimate),
 		});
 	} catch (error) {
 		console.log(error);
diff --git a/src/components/ListItem.jsx b/src/components/ListItem.jsx
index 3abda9c..102501c 100644
--- a/src/components/ListItem.jsx
+++ b/src/components/ListItem.jsx
@@ -1,57 +1,33 @@
 import { useState, useEffect } from 'react';
 import './ListItem.css';
-import { getFutureDate } from '../utils';
-
-export function ListItem({ name, id, dateLastPurchased, onCheck }) {
-	// State to track whether the item is checked
 
+export function ListItem({ name, dateLastPurchased, onCheck }) {
 	const [isChecked, setIsChecked] = useState(false);
 
-	// to see if `dateLastPurchased` and `isChecked` are working
-	console.log(`Rendering ListItem for ${name}:`, {
-		dateLastPurchased,
-		isChecked,
-	});
-
-	// Update `isChecked` based on the `dateLastPurchased` value
-
 	useEffect(() => {
 		const checkStatus = () => {
 			if (dateLastPurchased) {
-				// If dateLastPurchased is a Firestore _Timestamp, convert it to a JavaScript Date
-				const purchaseDate = dateLastPurchased.toDate
-					? dateLastPurchased.toDate()
-					: new Date(dateLastPurchased);
+				const purchaseDate = dateLastPurchased.toDate();
 				const timeSinceLastPurchase = new Date() - purchaseDate;
 				const hasBeenPurchasedRecently =
-					timeSinceLastPurchase < 24 * 60 * 60 * 1000; // 24 hours
+					timeSinceLastPurchase < 24 * 60 * 60 * 1000;
 
-				// Log check status
-				console.log(
-					`${name} was last purchased ${timeSinceLastPurchase} ms ago.`,
-				);
 				setIsChecked(hasBeenPurchasedRecently);
 			} else {
-				console.log(`${name} has never been purchased.`);
 				setIsChecked(false);
 			}
 		};
 
-		// initial check
 		checkStatus();
 	}, [dateLastPurchased]);
 
-	// old code from here
-	const handleChecked = () => {
-		onCheck(id);
-	};
 	return (
 		<li className="ListItem">
 			<label>
 				<input
 					type="checkbox"
 					checked={isChecked}
-					onChange={handleChecked}
+					onChange={onCheck}
 					disabled={isChecked}
 				/>
 				{name}
diff --git a/src/components/SearchForm.jsx b/src/components/SearchForm.jsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/utils/dates.js b/src/utils/dates.js
index 9331fda..face7b3 100644
--- a/src/utils/dates.js
+++ b/src/utils/dates.js
@@ -10,3 +10,13 @@ const ONE_DAY_IN_MILLISECONDS = 86400000;
 export function getFutureDate(offset) {
 	return new Date(Date.now() + offset * ONE_DAY_IN_MILLISECONDS);
 }
+
+/**
+ * Get a difference of days between two dates.
+ * @param {Date} lastPurchase
+ * @param {Date} nextPurchase
+ * @returns {number}
+ */
+export function getDaysBetweenDates(lastDate, nextDate) {
+	return Math.abs(nextDate - lastDate) / ONE_DAY_IN_MILLISECONDS;
+}
diff --git a/src/views/Home.jsx b/src/views/Home.jsx
index efaf427..6783c04 100644
--- a/src/views/Home.jsx
+++ b/src/views/Home.jsx
@@ -7,7 +7,7 @@ import { createList } from '../api/firebase';
 export function Home({ data, setListPath, userId, userEmail }) {
 	const [listName, setListName] = useState('');
 	const [message, setMessage] = useState('');
-	const navigate = useNavigate(); //to call redirected to the List view
+	const navigate = useNavigate();
 
 	const handleCreateListButton = async (e) => {
 		e.preventDefault();
@@ -22,14 +22,12 @@ export function Home({ data, setListPath, userId, userEmail }) {
 
 			const createListPath = `${userId}/${listName}}`;
 			setListPath(createListPath);
-			navigate('/list'); //redirect to the list view
+			navigate('/list');
 		} catch (error) {
-			//Logging and error messages if list is not created
 			console.error('error creating a list', error);
 			setMessage('Failed to create list. Please try again!');
 		}
 	};
-	console.log(data.length);
 
 	return (
 		<div className="Home">
diff --git a/src/views/Layout.jsx b/src/views/Layout.jsx
index f2b1c10..4f4347a 100644
--- a/src/views/Layout.jsx
+++ b/src/views/Layout.jsx
@@ -1,5 +1,4 @@
 import { Outlet, NavLink } from 'react-router-dom';
-
 import './Layout.css';
 import { auth } from '../api/config.js';
 import { SignInButton, SignOutButton, useAuth } from '../api/useAuth';
diff --git a/src/views/List.jsx b/src/views/List.jsx
index 1c511e4..c0d0cae 100644
--- a/src/views/List.jsx
+++ b/src/views/List.jsx
@@ -1,13 +1,10 @@
 import { ListItem } from '../components';
 import { useState } from 'react';
 import { updateItem } from '../api/firebase';
-import { getFutureDate } from '../utils';
 import { Link } from 'react-router-dom';
 
 export function List({ data, listPath, lists }) {
 	const [searchItem, setSearchItem] = useState('');
-	// Log filtered data
-	console.log('Rendering List with data:', data);
 
 	const handleSearch = (e) => {
 		e.preventDefault();
@@ -22,23 +19,13 @@ export function List({ data, listPath, lists }) {
 		item.name.toLowerCase().includes(searchItem.toLocaleLowerCase()),
 	);
 
-	const handleCheck = async (itemId) => {
+	const handleCheck = async (itemData) => {
+		let itemId = itemData.id;
 		const item = data.find((item) => item.id === itemId);
-		const currentTime = new Date();
-
 		const newTotalPurchases = (item.totalPurchases || 0) + 1;
-
 		await updateItem(listPath, itemId, {
-			dateLastPurchased: currentTime,
 			totalPurchases: newTotalPurchases,
 		});
-
-		setTimeout(async () => {
-			await updateItem(listPath, itemId, {
-				dateLastPurchased: null,
-				totalPurchases: newTotalPurchases,
-			});
-		}, getFutureDate);
 	};
 
 	return (
@@ -88,7 +75,7 @@ export function List({ data, listPath, lists }) {
 									id={item.id}
 									name={item.name}
 									dateLastPurchased={item.dateLastPurchased}
-									onCheck={handleCheck}
+									onCheck={() => handleCheck(item)}
 								/>
 							))}
 						</ul>
@@ -101,7 +88,7 @@ export function List({ data, listPath, lists }) {
 								name={item.name}
 								id={item.id}
 								dateLastPurchased={item.dateLastPurchased}
-								onCheck={handleCheck}
+								onCheck={() => handleCheck(item)}
 							/>
 						))}
 					</ul>