CFY-1144 some work