Added delay calculations