Updating TimedWait to be timer-less