Removed calls to Random.nextInt