Further work on package.