Added Time Updates And Corner Cases