simplified the packaging