Changed signature for full likelihood calculation