Better CAF Eq

Upates from Jason and Hubert