fine tuning
replace new Date() with Date.now()