Added ability for uniform distributed sampling back in.