Changing to System.Random