added cfa stuff