Updated with new snippets