Added more detailed time calculation