JC: adjustments to package.