CFG and everything update