Changed marginal prob calcs