CFY-598 more changes