Jira: GAM-0	Description: use new random algorithm	Reviewer: none