CFY-854 improved mock