[MODIFY] change to use Date.now()