Added Model 3 with p and q marginalised out.