re-parameterized clj versions of probs 1, 2