Update to output both times and predictions