Compute delay properly, see comments attached to #263
add change note