Adding underscore and correcting randomization