CFY-1688 updated setup.