Added option to separate the likelihood contributions vs. adding them together