Caf changes