Swaped "new Date().getTime()" with "System.currentTimeMillis()"