CFY-1433 some changes