Better CAF Eq

Testing updates from Hubert and Jason