updated for lcomp constants, including cases