update cfi handling