Added timecalculations