Here's the slighly improved package.