Improved Likelihood Calculator