Added random/time number generation