Made timing better. Now stops when there is no time left.