CFY-516 redo of packager