changed architecture of time calculations