Bug fix/likelihood caching feature