updating time api
Merge