Update with better time calls