added option to turn off likelihood check