remove shuffle and replace with random index call to improve performance