Updated Time function

The time functions look so much better now.