Changes to get weibull working