porting new to new CFG framework