Now using currentTimeMillis instead of System.nanotime