modified time utils a little bit