Improve probability calc