Simplified the package