Added non-delay case