Switching to using System.currentTimeMillis() instead of System.nanoTime()