updated so non-infinite delay