Fixes + Implemented Randomization