Testing Around
Revert "random no repeat fix"

This reverts commit 0846b8754e839108da93f20fa8137881ad93472f.
merge conflict
fix merge fix for style branch
refactoring for helper method