fixed time calculations
Temporary commit for logging