updated time acutation functionality
merging