Updates and fixes to Selector

Why are we making the random number a static variable?