Replaced new Date().getTime() with System.currentTimeMillis()