Uncommented time values and changed implementation for computing time
values.