CFY-959 more integration