Added calculation for delays