Added ability to interrupt waiting time calculation without throwing work away