Updates to homoscedastic model and added heteroscedastic