Updated To Use TimeUnit