Updated waits to not include start_time and stop_time.