CFY-1377 move things around