Issues 1-3: Fixed randomization and adding issue