CFY-959 some changes