Add initial probability estimation
Clean up and switch distribution