Updated to better track time