Correct output and add start/end time