Added randomness for grouping