Bug fix and support for total time