Template tweak & new problem
Better randomness