porting to new CFG framework