Uniform still working here, but other parts started refactoring for random restarts