new snippets, some revisions