Switch to seconds, optimize currentTimeInMillis usage