Changed to use miliseconds