Updated snippets from original package