Add more delay logic