initial caf changes