re-parameterized python versions of probs 1, 2