Better CAF Eq

Uo dates from Hubert and Jason