Now using Random instead of custom method