hopefully put merge change right, also added the constant in the liklihood calulation