Better CAF Eq

Not sure why this is not already in the system. Updates from Jason and Hubert.