Better CAF Equation

Review further results from Nik and Hubert.