Add closure and remove repeat delay