added changes to delay calculation
working with changes in delay calculations