Turned rand() back on
* Removed debug code