Updates to simplify the mcmc