Added Delay class back in