Added back support for BLOCK_LIKELIHOOD