Made the delay configurable