Few small changes

With the time delay